From 64757979e85c96c398ab56efe14ef5dcdbfe7f95 Mon Sep 17 00:00:00 2001 From: Ly-sec Date: Mon, 22 Sep 2025 16:25:44 +0200 Subject: [PATCH] Dock: use Style.fontSize, remove most logging --- Modules/Dock/Dock.qml | 12 ------------ Modules/Dock/DockMenu.qml | 8 +++----- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Modules/Dock/Dock.qml b/Modules/Dock/Dock.qml index b8e14344..11f633f5 100644 --- a/Modules/Dock/Dock.qml +++ b/Modules/Dock/Dock.qml @@ -30,7 +30,6 @@ Variants { Connections { target: ToplevelManager ? ToplevelManager.toplevels : null function onValuesChanged() { - Logger.log("Dock", "ToplevelManager.toplevels.onValuesChanged triggered") updateDockApps() } } @@ -39,7 +38,6 @@ Variants { Connections { target: ToplevelManager ? ToplevelManager.toplevels : null function onCountChanged() { - Logger.log("Dock", "ToplevelManager.toplevels.onCountChanged triggered, count:", ToplevelManager.toplevels.count) updateDockApps() } } @@ -111,8 +109,6 @@ Variants { const pinnedApps = Settings.data.dock.pinnedApps || [] const combined = [] - Logger.log("Dock", "Updating dock apps. Running:", runningApps.length, "Pinned:", pinnedApps.length) - // First, add pinned apps (both running and non-running) in their pinned order pinnedApps.forEach(pinnedAppId => { const runningApp = runningApps.find(toplevel => toplevel && toplevel.appId === pinnedAppId) @@ -124,7 +120,6 @@ Variants { "appId": runningApp.appId, "title": runningApp.title }) - Logger.log("Dock", "Added pinned-running app:", runningApp.appId) } else { // Pinned app that is not running combined.push({ @@ -133,7 +128,6 @@ Variants { "appId": pinnedAppId, "title": pinnedAppId }) - Logger.log("Dock", "Added pinned app:", pinnedAppId) } }) @@ -148,12 +142,10 @@ Variants { "appId": toplevel.appId, "title": toplevel.title }) - Logger.log("Dock", "Added running app:", toplevel.appId) } } }) - Logger.log("Dock", "Total dock apps:", combined.length) dockApps = combined } @@ -391,7 +383,6 @@ Variants { Connections { target: modelData?.toplevel function onClosed() { - Logger.log("Dock", "Toplevel closed signal received for:", appButton.appId) Qt.callLater(root.updateDockApps) } } @@ -519,17 +510,14 @@ Variants { const isValidToplevel = modelData?.toplevel && ToplevelManager && ToplevelManager.toplevels.values.includes(modelData.toplevel) if (mouse.button === Qt.MiddleButton && isValidToplevel && modelData.toplevel.close) { - Logger.log("Dock", "Middle-click closing app:", modelData.appId) modelData.toplevel.close() Qt.callLater(root.updateDockApps) // Force immediate dock update } else if (mouse.button === Qt.LeftButton) { if (isValidToplevel && modelData.toplevel.activate) { // Running app - activate it - Logger.log("Dock", "Activating running app:", modelData.appId) modelData.toplevel.activate() } else if (modelData?.appId) { // Pinned app not running - launch it - Logger.log("Dock", "Launching pinned app:", modelData.appId) Quickshell.execDetached(["gtk-launch", modelData.appId]) } } else if (mouse.button === Qt.RightButton) { diff --git a/Modules/Dock/DockMenu.qml b/Modules/Dock/DockMenu.qml index 66526b7e..f4b78ae5 100644 --- a/Modules/Dock/DockMenu.qml +++ b/Modules/Dock/DockMenu.qml @@ -49,7 +49,6 @@ PopupWindow { // Update the settings Settings.data.dock.pinnedApps = pinnedApps - Logger.log("DockMenu", isPinned ? "Unpinned" : "Pinned", "app:", appId) } anchor.item: anchorItem @@ -121,7 +120,7 @@ PopupWindow { NIcon { icon: "eye" - font.pointSize: 12 * scaling + font.pointSize: Style.fontSizeL * scaling color: Color.mOnSurface anchors.verticalCenter: parent.verticalCenter } @@ -174,7 +173,7 @@ PopupWindow { return "pin" return root.isAppPinned(root.toplevel.appId) ? "pinned-off" : "pin" } - font.pointSize: 12 * scaling + font.pointSize: Style.fontSizeL * scaling color: Color.mOnSurface anchors.verticalCenter: parent.verticalCenter } @@ -221,7 +220,7 @@ PopupWindow { NIcon { icon: "x" - font.pointSize: 12 * scaling + font.pointSize: Style.fontSizeL * scaling color: closeMouseArea.containsMouse ? Color.mPrimary : Color.mOnSurface anchors.verticalCenter: parent.verticalCenter } @@ -245,7 +244,6 @@ PopupWindow { const isValidToplevel = root.toplevel && ToplevelManager && ToplevelManager.toplevels.values.includes(root.toplevel) if (isValidToplevel && root.toplevel.close) { - Logger.log("DockMenu", "Closing app via menu:", root.toplevel.appId) root.toplevel.close() // Trigger immediate dock update callback if provided if (root.onAppClosed && typeof root.onAppClosed === "function") {