Merge pull request #386 from luleyleo/filtered-taskbar

Taskbar: Filter by screen and workspace

Modules/Bar/Widgets/Taskbar.qml

@@ -12,10 +12,27 @@ Rectangle {
   id: root
   property ShellScreen screen
   property real scaling: 1.0
+  
+  // Widget properties passed from Bar.qml for per-instance settings
+  property string widgetId: ""
+  property string section: ""
+  property int sectionWidgetIndex: -1
+  property int sectionWidgetsCount: 0
 
   readonly property bool isVerticalBar: Settings.data.bar.position === "left" || Settings.data.bar.position === "right"
   readonly property bool compact: (Settings.data.bar.density === "compact")
   readonly property real itemSize: compact ? Style.capsuleHeight * 0.9 * scaling : Style.capsuleHeight * 0.8 * scaling
+  
+  property var widgetMetadata: BarWidgetRegistry.widgetMetadata[widgetId]
+  property var widgetSettings: {
+    if (section && sectionWidgetIndex >= 0) {
+      var widgets = Settings.data.bar.widgets[section]
+      if (widgets && sectionWidgetIndex < widgets.length) {
+        return widgets[sectionWidgetIndex]
+      }
+    }
+    return {}
+  }
 
   // Always visible when there are toplevels
   implicitWidth: isVerticalBar ? Math.round(Style.capsuleHeight * scaling) : taskbarLayout.implicitWidth + Style.marginM * scaling * 2
@@ -41,12 +58,13 @@ Rectangle {
     columnSpacing: isVerticalBar ? 0 : Style.marginXXS * root.scaling
 
     Repeater {
-      model: ToplevelManager && ToplevelManager.toplevels ? ToplevelManager.toplevels : []
+      model: CompositorService.windows
       delegate: Item {
         id: taskbarItem
-        required property Toplevel modelData
-        property Toplevel toplevel: modelData
-        property bool isActive: ToplevelManager.activeToplevel === modelData
+        required property var modelData
+        
+        visible: (!widgetSettings.onlySameOutput || modelData.output == screen.name)
+          && (!widgetSettings.onlyActiveWorkspaces || CompositorService.getActiveWorkspaces().map(ws => ws.id).includes(modelData.workspaceId))
 
         Layout.preferredWidth: root.itemSize
         Layout.preferredHeight: root.itemSize
@@ -57,7 +75,7 @@ Rectangle {
           anchors.centerIn: parent
           width: parent.width
           height: parent.height
-          color: taskbarItem.isActive ? Color.mPrimary : root.color
+          color: modelData.isFocused ? Color.mPrimary : root.color
           border.width: 0
           radius: Math.round(Style.radiusXS * root.scaling)
           border.color: Color.transparent
@@ -86,13 +104,13 @@ Rectangle {
 
             if (mouse.button === Qt.LeftButton) {
               try {
-                taskbarItem.modelData.activate()
+                CompositorService.focusWindow(taskbarItem.modelData.id)
               } catch (error) {
                 Logger.error("Taskbar", "Failed to activate toplevel: " + error)
               }
             } else if (mouse.button === Qt.RightButton) {
               try {
-                taskbarItem.modelData.close()
+                CompositorService.closeWindow(taskbarItem.modelData.id)
               } catch (error) {
                 Logger.error("Taskbar", "Failed to close toplevel: " + error)
               }