fix(systray): added container widget and padding for systray

docs(systray): updated systray widget docs

Author: Video-Nomad

docs/widgets/(Widget)-Systray.md

@@ -12,6 +12,7 @@
 | `show_battery`            | boolean | `false`     | Whether to show battery icon (from the original systray).                               |
 | `show_volume`             | boolean | `false`     | Whether to show volume icon (from the original systray).                                |
 | `show_network`            | boolean | `false`     | Whether to show network icon (from the original systray).                               |
+| `container_padding`       | dict    | `None`      | Container padding.                                                                      |
 | `container_shadow`        | dict    | `None`      | Container shadow options.                                                               |
 | `unpinned_shadow`         | dict    | `None`      | Unpinned container shadow options.                                                      |
 | `pinned_shadow`           | dict    | `None`      | Pinned container shadow options.                                                        |
@@ -35,6 +36,11 @@ systray:
     show_battery: false
     show_volume: false
     show_network: false
+    container_padding:
+        left: 0
+        top: 0
+        right: 0
+        bottom: 0
     btn_shadow:
       enabled: true
       color: "black"
@@ -65,15 +71,22 @@ There are some limitations with the systray widget:
 - **show_battery:** Whether to show battery icon (from the original systray).
 - **show_volume:** Whether to show volume icon (from the original systray).
 - **show_network:** Whether to show network icon (from the original systray).
+- **container_padding:** Padding for the widget container.
+- **container_shadow:** Container shadow options.
+- **unpinned_shadow:** Unpinned container shadow options.
+- **pinned_shadow:** Pinned container shadow options.
+- **unpinned_vis_btn_shadow:** Unpinned visibility button shadow options.
+- **btn_shadow:** Systray button (icons) shadow options.
 
 ## Debug Options
 Show unpinned button has a right click menu that allows you to refresh the systray icons.
 
 ## Style
 ```css
 .systray {} /* The base widget style */
-.systray .unpinned-container {} /* Style for unpinned container */
-.systray .pinned-container {} /* Style for pinned container */
+.systray .widget-container {} /* Style for the widget container */
+.systray .unpinned-container {} /* Style for container with unpinned systray icons */
+.systray .pinned-container {} /* Style for container with pinned systray icons */
 .systray .pinned-container[forceshow=true] {} /* Style for pinned container when it is forced to show during dragging operation */
 .systray .button {} /* Style for the individual systray buttons/icons */
 .systray .button[dragging=true] {} /* Style for systray buttons/icons when dragging operation is in progress */

src/core/validation/widgets/yasb/systray.py

@@ -10,6 +10,7 @@
     "show_battery": False,
     "show_volume": False,
     "show_network": False,
+    "container_padding": {"left": 0, "top": 0, "right": 0, "bottom": 0},
     "default_shadow": {
         "enabled": False,
         "color": "black",
@@ -76,6 +77,17 @@
         "required": False,
         "default": DEFAULTS["show_network"],
     },
+    "container_padding": {
+        "type": "dict",
+        "required": False,
+        "schema": {
+            "left": {"type": "integer", "default": 0},
+            "top": {"type": "integer", "default": 0},
+            "right": {"type": "integer", "default": 0},
+            "bottom": {"type": "integer", "default": 0},
+        },
+        "default": DEFAULTS["container_padding"],
+    },
     "container_shadow": {
         "type": "dict",
         "required": False,

src/core/widgets/yasb/systray.py

@@ -21,6 +21,7 @@
     QLayout,
     QMenu,
     QPushButton,
+    QWidget,
 )
 
 from core.utils.systray.systray_widget import DropWidget, IconState, IconWidget
@@ -98,6 +99,7 @@ def __init__(
         show_battery: bool,
         show_volume: bool,
         show_network: bool,
+        container_padding: dict[str, int],
         container_shadow: dict[str, Any],
         unpinned_shadow: dict[str, Any],
         pinned_shadow: dict[str, Any],
@@ -111,6 +113,7 @@ def __init__(
         self.icon_size = icon_size
         self.show_unpinned = show_unpinned
         self.show_unpinned_button = show_unpinned_button
+        self.container_padding = container_padding
         self.container_shadow = container_shadow
         self.unpinned_shadow = unpinned_shadow
         self.pinned_shadow = pinned_shadow
@@ -149,7 +152,20 @@ def __init__(
         self.pinned_vis_check_timer.timeout.connect(self.update_pinned_widget_visibility)  # type: ignore
         self.pinned_vis_check_timer.setSingleShot(True)
 
-        self.unpinned_vis_btn = QPushButton()
+        self.widget_container_layout = QHBoxLayout()
+        self.widget_container_layout.setSpacing(0)
+        self.widget_container_layout.setContentsMargins(
+            self.container_padding["left"],
+            self.container_padding["top"],
+            self.container_padding["right"],
+            self.container_padding["bottom"],
+        )
+
+        self.widget_container = QWidget(self)
+        self.widget_container.setLayout(self.widget_container_layout)
+        self.widget_container.setProperty("class", "widget-container")
+
+        self.unpinned_vis_btn = QPushButton(self)
         self.unpinned_vis_btn.setCheckable(True)
         self.unpinned_vis_btn.clicked.connect(self.toggle_unpinned_widget_visibility)  # type: ignore
         self.unpinned_vis_btn.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu)
@@ -172,18 +188,20 @@ def __init__(
         self.pinned_widget.drag_started.connect(self.on_drag_started)  # type: ignore
         self.pinned_widget.drag_ended.connect(self.on_drag_ended)  # type: ignore
 
-        add_shadow(self._widget_frame, self.container_shadow)
+        add_shadow(self.widget_container, self.container_shadow)
         add_shadow(self.unpinned_widget, self.unpinned_shadow)
         add_shadow(self.pinned_widget, self.pinned_shadow)
         add_shadow(self.unpinned_vis_btn, self.unpinned_vis_btn_shadow)
 
-        self.widget_layout.addWidget(self.unpinned_widget)
-        self.widget_layout.addWidget(self.pinned_widget)
+        self.widget_container_layout.addWidget(self.unpinned_widget)
+        self.widget_container_layout.addWidget(self.pinned_widget)
 
         if self.label_position == "left":
-            self.widget_layout.insertWidget(0, self.unpinned_vis_btn)
+            self.widget_container_layout.insertWidget(0, self.unpinned_vis_btn)
         else:
-            self.widget_layout.insertWidget(-1, self.unpinned_vis_btn)
+            self.widget_container_layout.insertWidget(-1, self.unpinned_vis_btn)
+
+        self.widget_layout.addWidget(self.widget_container)
 
         self.unpinned_vis_btn.setVisible(self.show_unpinned_button)