Merge pull request #634 from ycf-anon/screen-toolkit

Screen toolkit rework: UI, fixes, and improvements

Author: spiros132

screen-toolkit/Annotate.qml

@@ -1,26 +1,55 @@
 import QtQuick
 import Quickshell
-import qs.Widgets
 import qs.Commons
+import qs.Widgets
+import qs.Modules.Bar.Extras
 import qs.Services.UI
 
-NIconButton {
+Item {
     id: root
     property ShellScreen screen
     property string widgetId: ""
     property string section: ""
     property int sectionWidgetIndex: -1
     property int sectionWidgetsCount: 0
     property var pluginApi: null
-    icon: "crosshair"
-    tooltipText: pluginApi?.tr("widget.tooltip")
-    tooltipDirection: BarService.getTooltipDirection(screen?.name)
-    colorBg: Style.capsuleColor
-    colorBorder: "transparent"
-    colorBorderHover: "transparent"
-    border.color: Style.capsuleBorderColor
-    border.width: Style.capsuleBorderWidth
-    onClicked: {
-        if (pluginApi) pluginApi.togglePanel(screen, this)
+
+    implicitWidth:  pill.width
+    implicitHeight: pill.height
+
+    BarPill {
+        id: pill
+        screen: root.screen
+        oppositeDirection: BarService.getPillDirection(root)
+        forceClose: true
+
+        icon:        "crosshair"
+        tooltipText: pluginApi?.tr("widget.tooltip")
+
+        onClicked: {
+            if (pluginApi) pluginApi.togglePanel(root.screen, pill)
+        }
+
+        onRightClicked: {
+            PanelService.showContextMenu(contextMenu, pill, root.screen)
+        }
+    }
+
+    NPopupContextMenu {
+        id: contextMenu
+        model: [
+            {
+                "label":   pluginApi?.tr("settings.widgetSettings"),
+                "action":  "widget-settings",
+                "icon":    "settings",
+                "enabled": true
+            }
+        ]
+        onTriggered: action => {
+            contextMenu.close()
+            PanelService.closeContextMenu(root.screen)
+            if (action === "widget-settings")
+                BarService.openPluginSettings(screen, pluginApi.manifest)
+        }
     }
 }