From 85bf62eaa2fd71eb15ef401e537457fb9098a540 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 1 Sep 2025 15:12:09 +0200
Subject: ...

---
 .../shell/quickshell/WorkspaceSwitcher.qml         | 85 +++++++++++++---------
 1 file changed, 49 insertions(+), 36 deletions(-)

(limited to 'accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml')

diff --git a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
index 153c56bb..9546abb4 100644
--- a/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
+++ b/accounts/gkleen@sif/shell/quickshell/WorkspaceSwitcher.qml
@@ -1,5 +1,7 @@
+import Quickshell
 import QtQuick
 import qs.Services
+import Quickshell.Widgets
 
 Row {
   id: workspaces
@@ -11,61 +13,72 @@ Row {
   spacing: 0
 
   Repeater {
-    model: {
-      let currWorkspaces = NiriService.workspaces;
-      const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
-      currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
-      currWorkspaces.sort((a, b) => {
-	if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
-	  return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
-	if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
-	  return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
-	return a.idx - b.idx;
-      });
-      return currWorkspaces;
+    model: ScriptModel {
+      values: {
+	let currWorkspaces = NiriService.workspaces;
+	const ignoreWorkspaces = Array.from(workspaces.ignoreWorkspaces);
+	currWorkspaces = currWorkspaces.filter(ws => ws.is_active || ignoreWorkspaces.every(iws => iws !== ws.name));
+	currWorkspaces.sort((a, b) => {
+	  if (NiriService.outputs?.[a.output]?.logical?.x !== NiriService.outputs?.[b.output]?.logical?.x)
+	    return NiriService.outputs?.[a.output]?.logical?.x - NiriService.outputs?.[b.output]?.logical?.x
+	  if (NiriService.outputs?.[a.output]?.logical?.y !== NiriService.outputs?.[b.output]?.logical?.y)
+	    return NiriService.outputs?.[a.output]?.logical?.y - NiriService.outputs?.[b.output]?.logical?.y
+	  return a.idx - b.idx;
+	});
+	return currWorkspaces;
+      }
     }
 
-    Rectangle {
+    Item {
+      id: wsItem
+
       property var workspaceData: modelData
 
       width: wsLabel.contentWidth + 8
-      color: {
-	if (mouseArea.containsMouse) {
-	  return "#33808080";
-	}
-	return "transparent";
-      }
       height: parent.height
       anchors.verticalCenter: parent.verticalCenter
 
-      MouseArea {
+      WrapperMouseArea {
 	id: mouseArea
 
 	anchors.fill: parent
+
 	hoverEnabled: true
 	cursorShape: Qt.PointingHandCursor
 	enabled: true
 	onClicked: {
 	  NiriService.sendCommand({ "Action": { "FocusWorkspace": { "reference": { "Id": workspaceData.id } } } }, _ => {})
 	}
-      }
 
-      Text {
-	id: wsLabel
-
-	font.pointSize: 10
-	font.family: "Fira Sans"
-	color: {
-	  if (workspaceData.is_active)
-	    return "#23fd00";
-	  if (workspaceData.active_window_id === null)
-	    return "#555";
-	  return "white";
-	}
-	anchors.centerIn: parent
+	Rectangle {
+	  anchors.fill: parent
+
+	  color: {
+	    if (mouseArea.containsMouse) {
+	      return "#33808080";
+	    }
+	    return "transparent";
+	  }
+
+	  Text {
+	    id: wsLabel
 
-	text: workspaceData.name ? workspaceData.name : workspaceData.idx
+	    anchors.centerIn: parent
+
+	    font.pointSize: 10
+	    font.family: "Fira Sans"
+	    color: {
+	      if (workspaceData.is_active)
+		return "#23fd00";
+	      if (workspaceData.active_window_id === null)
+		return "#555";
+	      return "white";
+	    }
+
+	    text: workspaceData.name ? workspaceData.name : workspaceData.idx
+	  }
+	}
       }
     }
   }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3