diff --git a/Modules/MainScreen/Backgrounds/AllBackgrounds.qml b/Modules/MainScreen/Backgrounds/AllBackgrounds.qml index e566aedb..acb6c53a 100644 --- a/Modules/MainScreen/Backgrounds/AllBackgrounds.qml +++ b/Modules/MainScreen/Backgrounds/AllBackgrounds.qml @@ -57,6 +57,7 @@ Item { bar: root.bar shapeContainer: backgroundsShape windowRoot: root.windowRoot + backgroundColor: Qt.alpha(Color.mSurface, Settings.data.bar.backgroundOpacity) } @@ -68,84 +69,98 @@ Item { PanelBackground { panel: root.windowRoot.audioPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Battery PanelBackground { panel: root.windowRoot.batteryPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Bluetooth PanelBackground { panel: root.windowRoot.bluetoothPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Calendar PanelBackground { panel: root.windowRoot.calendarPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Control Center PanelBackground { panel: root.windowRoot.controlCenterPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Launcher PanelBackground { panel: root.windowRoot.launcherPanel shapeContainer: backgroundsShape + backgroundColor: Qt.alpha(Color.mSurface, Settings.data.appLauncher.backgroundOpacity) } // Notification History PanelBackground { panel: root.windowRoot.notificationHistoryPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Session Menu PanelBackground { panel: root.windowRoot.sessionMenuPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Settings PanelBackground { panel: root.windowRoot.settingsPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Setup Wizard PanelBackground { panel: root.windowRoot.setupWizardPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // TrayDrawer PanelBackground { panel: root.windowRoot.trayDrawerPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // TrayMenu PanelBackground { panel: root.windowRoot.trayMenuPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // Wallpaper PanelBackground { panel: root.windowRoot.wallpaperPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } // WiFi PanelBackground { panel: root.windowRoot.wifiPanel shapeContainer: backgroundsShape + backgroundColor: Color.mSurface } } diff --git a/Modules/MainScreen/Backgrounds/BarBackground.qml b/Modules/MainScreen/Backgrounds/BarBackground.qml index e91ca8cc..31e4cbc4 100644 --- a/Modules/MainScreen/Backgrounds/BarBackground.qml +++ b/Modules/MainScreen/Backgrounds/BarBackground.qml @@ -29,8 +29,10 @@ ShapePath { // Required reference to windowRoot for screen access required property var windowRoot + required property color backgroundColor + // Check if bar should be visible on this screen - readonly property bool shouldShowBar: { + readonly property bool shouldShow: { // Check global bar visibility if (!BarService.isVisible) return false @@ -83,7 +85,7 @@ ShapePath { // ShapePath configuration strokeWidth: -1 // No stroke, fill only - fillColor: shouldShowBar ? Qt.alpha(Color.mSurface, Settings.data.bar.backgroundOpacity) : Color.transparent + fillColor: shouldShow ? backgroundColor : Color.transparent // Starting position (top-left corner, after the arc) // Use mapped coordinates relative to the Shape container diff --git a/Modules/MainScreen/Backgrounds/PanelBackground.qml b/Modules/MainScreen/Backgrounds/PanelBackground.qml index 686ac35f..bc71d473 100644 --- a/Modules/MainScreen/Backgrounds/PanelBackground.qml +++ b/Modules/MainScreen/Backgrounds/PanelBackground.qml @@ -28,6 +28,8 @@ ShapePath { // Corner radius (from Style) readonly property real radius: Style.radiusL + required property color backgroundColor + // Get the actual panelBackground Item from SmartPanel // Only access panelRegion if panel exists and is visible readonly property var panelBg: (panel && panel.visible) ? panel.panelRegion : null @@ -75,7 +77,7 @@ ShapePath { startX: panelX + tlRadius * tlMultX startY: panelY - fillColor: Color.mSurface + fillColor: (panel && panel.visible) ? backgroundColor : Color.transparent // ========== PATH DEFINITION ========== // Draws a rectangle with potentially inverted corners