notifications: added manual offsetX and offsetY + fixed surface not being destroyed when the last notification disappear

Author: ItsLemmy

assets/translations/en.json

@@ -1906,6 +1906,14 @@
           "label": "Toast Opacity",
           "description": "Background opacity of notification toasts"
         },
+        "offset-x": {
+          "label": "Horizontal Offset",
+          "description": "Extra horizontal offset from the screen edge"
+        },
+        "offset-y": {
+          "label": "Vertical Offset",
+          "description": "Extra vertical offset from the screen edge"
+        },
         "monitors": {
           "label": "Displays",
           "description": "Choose which displays show notification toasts; leave empty to show on all displays"

src/config/config_overrides.cpp

@@ -318,7 +318,8 @@ namespace {
 
   bool notificationConfigEqual(const NotificationConfig& a, const NotificationConfig& b) {
     return a.enableDaemon == b.enableDaemon && a.position == b.position && a.layer == b.layer &&
-           nearlyEqual(a.backgroundOpacity, b.backgroundOpacity) && a.monitors == b.monitors;
+           nearlyEqual(a.backgroundOpacity, b.backgroundOpacity) && a.offsetX == b.offsetX && a.offsetY == b.offsetY &&
+           a.monitors == b.monitors;
   }
 
   bool audioConfigEqual(const AudioConfig& a, const AudioConfig& b) {

src/config/config_service.cpp

@@ -1461,6 +1461,10 @@ void ConfigService::parseTableInto(const toml::table& tbl, Config& config, bool
       notif.layer = *v;
     if (auto v = notifTable["background_opacity"].value<double>())
       notif.backgroundOpacity = std::clamp(static_cast<float>(*v), 0.0f, 1.0f);
+    if (auto v = notifTable["offset_x"].value<int64_t>())
+      notif.offsetX = static_cast<int>(*v);
+    if (auto v = notifTable["offset_y"].value<int64_t>())
+      notif.offsetY = static_cast<int>(*v);
     if (const auto* v = notifTable.get("monitors")) {
       notif.monitors = readStringArray(*v);
     }

src/config/config_types.h

@@ -358,6 +358,8 @@ struct NotificationConfig {
   std::string position = "top_right";
   std::string layer = "top";       // top | overlay
   float backgroundOpacity = 0.97f; // toast card background alpha (0.0–1.0)
+  int offsetX = 0;
+  int offsetY = 0;
   std::vector<std::string> monitors;
 };
 

src/shell/notification/notification_toast.cpp

@@ -896,18 +896,16 @@ void NotificationToast::dismissCardFromInstance(Instance& inst, std::size_t entr
   const float targetY = card->y();
   const uint32_t removingId = (entryIndex < m_entries.size()) ? m_entries[entryIndex].notificationId : 0;
 
-  // Only the first instance drives finishRemoval
-  bool isDriver = (m_instances.size() > 0 && m_instances[0].get() == &inst);
   cs.exitAnimId = inst.animations.animate(
       startReveal, 0.0f, Style::animNormal, Easing::EaseInOutQuad,
       [this, card, content, foreground, targetY](float v) {
         applyCardRevealNodes(card, content, foreground, v, targetY, revealFromLeftEdge());
       },
-      [this, &inst, entryIndex, isDriver, removingId]() {
+      [this, &inst, entryIndex, removingId]() {
         if (entryIndex < inst.cards.size()) {
           inst.cards[entryIndex].exitAnimId = 0;
         }
-        if (isDriver && removingId != 0) {
+        if (removingId != 0) {
           DeferredCall::callLater([this, removingId]() { finishRemoval(removingId); });
         }
       },
@@ -1338,25 +1336,40 @@ void NotificationToast::ensureSurfaces() {
     inst->output = output.output;
     inst->scale = output.scale;
 
+    const auto& notifCfg = m_config->config().notification;
+    const int offX = notifCfg.offsetX;
+    const int offY = notifCfg.offsetY;
+
     std::uint32_t anchor = LayerShellAnchor::Top | LayerShellAnchor::Bottom | LayerShellAnchor::Right;
     std::int32_t marginTop = kSurfaceMargin;
     std::int32_t marginRight = kSurfaceMargin;
     std::int32_t marginBottom = kSurfaceMargin;
     std::int32_t marginLeft = kSurfaceMargin;
-    if (position == "top_left") {
+    if (position == "top_right") {
+      marginTop += offY;
+      marginRight += offX;
+    } else if (position == "top_left") {
       anchor = LayerShellAnchor::Top | LayerShellAnchor::Bottom | LayerShellAnchor::Left;
+      marginTop += offY;
+      marginLeft += offX;
     } else if (position == "top_center") {
       anchor = LayerShellAnchor::Top | LayerShellAnchor::Bottom;
+      marginTop += offY;
       marginLeft = 0;
       marginRight = 0;
+    } else if (position == "bottom_right") {
+      anchor = LayerShellAnchor::Top | LayerShellAnchor::Bottom | LayerShellAnchor::Right;
+      marginBottom += offY;
+      marginRight += offX;
     } else if (position == "bottom_left") {
       anchor = LayerShellAnchor::Top | LayerShellAnchor::Bottom | LayerShellAnchor::Left;
+      marginBottom += offY;
+      marginLeft += offX;
     } else if (position == "bottom_center") {
       anchor = LayerShellAnchor::Top | LayerShellAnchor::Bottom;
+      marginBottom += offY;
       marginLeft = 0;
       marginRight = 0;
-    } else if (position == "bottom_right") {
-      anchor = LayerShellAnchor::Top | LayerShellAnchor::Bottom | LayerShellAnchor::Right;
     }
 
     auto surfaceConfig = LayerSurfaceConfig{

src/shell/settings/settings_registry.cpp

@@ -1088,6 +1088,12 @@ namespace settings {
                                 tr("settings.schema.notifications.daemon.description"),
                                 {"notification", "enable_daemon"}, ToggleSetting{cfg.notification.enableDaemon},
                                 "dbus"));
+    entries.push_back(makeEntry(
+        "notifications", "toasts", tr("settings.schema.notifications.layer.label"),
+        tr("settings.schema.notifications.layer.description"), {"notification", "layer"},
+        asSegmented(plainSelect({{"top", "settings.options.layer.top"}, {"overlay", "settings.options.layer.overlay"}},
+                                cfg.notification.layer)),
+        "toast layer shell z-order"));
     entries.push_back(makeEntry("notifications", "toasts", tr("settings.schema.notifications.position.label"),
                                 tr("settings.schema.notifications.position.description"), {"notification", "position"},
                                 plainSelect({{"top_right", "settings.options.screen-position.top-right"},
@@ -1099,11 +1105,17 @@ namespace settings {
                                             cfg.notification.position),
                                 "toast popup placement anchor"));
     entries.push_back(makeEntry(
-        "notifications", "toasts", tr("settings.schema.notifications.layer.label"),
-        tr("settings.schema.notifications.layer.description"), {"notification", "layer"},
-        asSegmented(plainSelect({{"top", "settings.options.layer.top"}, {"overlay", "settings.options.layer.overlay"}},
-                                cfg.notification.layer)),
-        "toast layer shell z-order"));
+        "notifications", "toasts", tr("settings.schema.notifications.offset-x.label"),
+        tr("settings.schema.notifications.offset-x.description"), {"notification", "offset_x"},
+        StepperSetting{
+            .value = cfg.notification.offsetX, .minValue = 0, .maxValue = 200, .step = 1, .valueSuffix = "px"},
+        "offset margin horizontal"));
+    entries.push_back(makeEntry(
+        "notifications", "toasts", tr("settings.schema.notifications.offset-y.label"),
+        tr("settings.schema.notifications.offset-y.description"), {"notification", "offset_y"},
+        StepperSetting{
+            .value = cfg.notification.offsetY, .minValue = 0, .maxValue = 200, .step = 1, .valueSuffix = "px"},
+        "offset margin vertical"));
     entries.push_back(makeEntry("notifications", "toasts", tr("settings.schema.notifications.toast-opacity.label"),
                                 tr("settings.schema.notifications.toast-opacity.description"),
                                 {"notification", "background_opacity"},