From df3751108916054b61c450a46ee3310c4c2908a4 Mon Sep 17 00:00:00 2001 From: ItsLemmy Date: Sun, 16 Nov 2025 19:40:51 -0500 Subject: [PATCH] Panels: code simplification --- .../MainScreen/Backgrounds/AllBackgrounds.qml | 2 - Modules/MainScreen/BarExclusionZone.qml | 3 - Modules/MainScreen/MainScreen.qml | 93 +++---------------- Modules/MainScreen/SmartPanel.qml | 11 +-- 4 files changed, 14 insertions(+), 95 deletions(-) diff --git a/Modules/MainScreen/Backgrounds/AllBackgrounds.qml b/Modules/MainScreen/Backgrounds/AllBackgrounds.qml index 7e1bc5c6..c5dbcda8 100644 --- a/Modules/MainScreen/Backgrounds/AllBackgrounds.qml +++ b/Modules/MainScreen/Backgrounds/AllBackgrounds.qml @@ -46,8 +46,6 @@ Item { Component.onCompleted: { Logger.d("AllBackgrounds", "AllBackgrounds initialized"); - Logger.d("AllBackgrounds", " bar:", root.bar); - Logger.d("AllBackgrounds", " windowRoot:", root.windowRoot); } /** diff --git a/Modules/MainScreen/BarExclusionZone.qml b/Modules/MainScreen/BarExclusionZone.qml index ea0506b1..c4561888 100644 --- a/Modules/MainScreen/BarExclusionZone.qml +++ b/Modules/MainScreen/BarExclusionZone.qml @@ -66,8 +66,5 @@ PanelWindow { Component.onCompleted: { Logger.d("BarExclusionZone", "Created for screen:", screen?.name); - Logger.d("BarExclusionZone", " Position:", barPosition, "Exclusive:", exclusive, "Floating:", barFloating); - Logger.d("BarExclusionZone", " Anchors - top:", anchors.top, "bottom:", anchors.bottom, "left:", anchors.left, "right:", anchors.right); - Logger.d("BarExclusionZone", " Size:", width, "x", height, "implicitWidth:", implicitWidth, "implicitHeight:", implicitHeight); } } diff --git a/Modules/MainScreen/MainScreen.qml b/Modules/MainScreen/MainScreen.qml index f851aa86..6eda2dea 100644 --- a/Modules/MainScreen/MainScreen.qml +++ b/Modules/MainScreen/MainScreen.qml @@ -158,134 +158,74 @@ PanelWindow { // --------------------------------------- AudioPanel { id: audioPanel + objectName: "audioPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "audioPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(audioPanel); - } } BluetoothPanel { id: bluetoothPanel + objectName: "bluetoothPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "bluetoothPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(bluetoothPanel); - } } ControlCenterPanel { id: controlCenterPanel + objectName: "controlCenterPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "controlCenterPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(controlCenterPanel); - } } CalendarPanel { id: calendarPanel + objectName: "calendarPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "calendarPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(calendarPanel); - } } Launcher { id: launcherPanel + objectName: "launcherPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "launcherPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(launcherPanel); - } } NotificationHistoryPanel { id: notificationHistoryPanel + objectName: "notificationHistoryPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "notificationHistoryPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(notificationHistoryPanel); - } } SessionMenu { id: sessionMenuPanel + objectName: "sessionMenuPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "sessionMenuPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(sessionMenuPanel); - } } SettingsPanel { id: settingsPanel + objectName: "settingsPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "settingsPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(settingsPanel); - } } SetupWizard { id: setupWizardPanel + objectName: "setupWizardPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "setupWizardPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(setupWizardPanel); - } } TrayDrawerPanel { id: trayDrawerPanel + objectName: "trayDrawerPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "trayDrawerPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(trayDrawerPanel); - } } WallpaperPanel { id: wallpaperPanel + objectName: "wallpaperPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "wallpaperPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(wallpaperPanel); - } } WiFiPanel { id: wifiPanel + objectName: "wifiPanel-" + (root.screen?.name || "unknown") screen: root.screen - z: 50 - - Component.onCompleted: { - objectName = "wifiPanel-" + (screen?.name || "unknown"); - PanelService.registerPanel(wifiPanel); - } } // ---------------------------------------------- @@ -384,15 +324,6 @@ PanelWindow { } return -1; } - - Component.onCompleted: { - Logger.d("MainScreen", "===== Bar placeholder loaded ====="); - Logger.d("MainScreen", " Screen:", screen?.name, "Size:", screen?.width, "x", screen?.height); - Logger.d("MainScreen", " Bar position:", barPosition, "| isVertical:", barIsVertical); - Logger.d("MainScreen", " Bar dimensions: x=" + x, "y=" + y, "width=" + width, "height=" + height); - Logger.d("MainScreen", " Style.barHeight =", Style.barHeight); - Logger.d("MainScreen", " Margins: H=" + barMarginH, "V=" + barMarginV, "| Floating:", barFloating); - } } /** diff --git a/Modules/MainScreen/SmartPanel.qml b/Modules/MainScreen/SmartPanel.qml index 736eb9df..25cc8641 100644 --- a/Modules/MainScreen/SmartPanel.qml +++ b/Modules/MainScreen/SmartPanel.qml @@ -179,15 +179,8 @@ Item { } } - // Register with PanelService (backward compatibility) - // Note: Registration happens in MainScreen after objectName is set + // Register with PanelService Component.onCompleted: { - // Use Qt.callLater to ensure objectName is set by parent before registering - Qt.callLater(function () { - if (!objectName) { - Logger.w("SmartPanel", "Panel created without objectName - PanelService registration may fail"); - } - PanelService.registerPanel(root); - }); + PanelService.registerPanel(root); } }