From 3de5936faab912cacc96917a1e634202a37d92d2 Mon Sep 17 00:00:00 2001 From: Lemmy Date: Wed, 17 Dec 2025 08:16:48 -0500 Subject: [PATCH 1/2] Taskbar+Workspace: replaced semi-transparent opacity by little scale. --- Modules/Bar/Widgets/Taskbar.qml | 2 +- Modules/Bar/Widgets/Workspace.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Bar/Widgets/Taskbar.qml b/Modules/Bar/Widgets/Taskbar.qml index c119b1b5e..eb18da653 100644 --- a/Modules/Bar/Widgets/Taskbar.qml +++ b/Modules/Bar/Widgets/Taskbar.qml @@ -517,7 +517,7 @@ Rectangle { source: ThemeIcons.iconForAppId(taskbarItem.modelData.appId) smooth: true asynchronous: true - opacity: (shouldShowTitle || taskbarItem.isFocused) ? Style.opacityFull : 0.6 + scale: taskbarItem.isFocused ? 1.0 : 0.8 // Apply dock shader to all taskbar icons layer.enabled: widgetSettings.colorizeIcons !== false diff --git a/Modules/Bar/Widgets/Workspace.qml b/Modules/Bar/Widgets/Workspace.qml index 2f8710803..16e47861c 100644 --- a/Modules/Bar/Widgets/Workspace.qml +++ b/Modules/Bar/Widgets/Workspace.qml @@ -759,7 +759,7 @@ Item { source: ThemeIcons.iconForAppId(model.appId) smooth: true asynchronous: true - opacity: model.isFocused ? Style.opacityFull : 0.6 + scale: model.isFocused ? 1.0 : 0.8 layer.enabled: root.colorizeIcons && !model.isFocused Behavior on opacity { From 7157dc48fd4a17e506c5b959b5ff2bb71047f91a Mon Sep 17 00:00:00 2001 From: Lemmy Date: Wed, 17 Dec 2025 08:16:56 -0500 Subject: [PATCH 2/2] autoformatting --- Services/Compositor/NiriService.qml | 67 ++++++++++++++--------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/Services/Compositor/NiriService.qml b/Services/Compositor/NiriService.qml index db373ffc0..1607aef96 100644 --- a/Services/Compositor/NiriService.qml +++ b/Services/Compositor/NiriService.qml @@ -114,7 +114,7 @@ Item { "isActive": ws.is_active === true, "isUrgent": ws.is_urgent === true, "isOccupied": ws.active_window_id ? true : false - } + }; workspacesList.push(wsData); workspaceCache[ws.id] = wsData; @@ -243,41 +243,38 @@ Item { } function toSortedWindowList(windowList) { - return windowList - .map(win => { - const workspace = workspaceCache[win.workspaceId]; - const output = (workspace && workspace.output) ? outputCache[workspace.output] : null; + return windowList.map(win => { + const workspace = workspaceCache[win.workspaceId]; + const output = (workspace && workspace.output) ? outputCache[workspace.output] : null; - return { - window: win, - workspaceIdx: workspace ? workspace.idx : 0, - outputX: output ? output.x : 0, - outputY: output ? output.y : 0, - }; - }) - .sort((a, b) => { - // Sort by output position first - if (a.outputX !== b.outputX) { - return a.outputX - b.outputX; - } - if (a.outputY !== b.outputY) { - return a.outputY - b.outputY; - } - // Then by workspace index - if (a.workspaceIdx !== b.workspaceIdx) { - return a.workspaceIdx - b.workspaceIdx; - } - // Then by window position - if (a.window.position.x !== b.window.position.x) { - return a.window.position.x - b.window.position.x; - } - if (a.window.position.y !== b.window.position.y) { - return a.window.position.y - b.window.position.y; - } - // Finally by window ID to ensure consistent ordering - return a.window.id - b.window.id; - }) - .map(info => info.window); + return { + window: win, + workspaceIdx: workspace ? workspace.idx : 0, + outputX: output ? output.x : 0, + outputY: output ? output.y : 0 + }; + }).sort((a, b) => { + // Sort by output position first + if (a.outputX !== b.outputX) { + return a.outputX - b.outputX; + } + if (a.outputY !== b.outputY) { + return a.outputY - b.outputY; + } + // Then by workspace index + if (a.workspaceIdx !== b.workspaceIdx) { + return a.workspaceIdx - b.workspaceIdx; + } + // Then by window position + if (a.window.position.x !== b.window.position.x) { + return a.window.position.x - b.window.position.x; + } + if (a.window.position.y !== b.window.position.y) { + return a.window.position.y - b.window.position.y; + } + // Finally by window ID to ensure consistent ordering + return a.window.id - b.window.id; + }).map(info => info.window); } function recollectWindows(windowsData) {