never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bar widgets: fixed bg colors when used with showCapsule=false

Browse source
This commit is contained in:
LemmyCook 2025-09-16 22:20:42 -04:00
parent cdca7c1d83
commit 3a6bf8d299
10 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/Bar/Widgets/Bluetooth.qml
View file

@ -15,7 +15,7 @@ NIconButton {
baseSize: Style.capsuleHeight baseSize: Style.capsuleHeight
compact: (Settings.data.bar.density === "compact") compact: (Settings.data.bar.density === "compact")
colorBg: Color.mSurfaceVariant colorBg: Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent
colorFg: Color.mOnSurface colorFg: Color.mOnSurface
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent

4
Modules/Bar/Widgets/DarkModeToggle.qml
View file

@ -13,9 +13,11 @@ NIconButton {
tooltipText: "Toggle light/dark mode." tooltipText: "Toggle light/dark mode."
compact: (Settings.data.bar.density === "compact") compact: (Settings.data.bar.density === "compact")
baseSize: Style.capsuleHeight baseSize: Style.capsuleHeight
colorBg: Settings.data.colorSchemes.darkMode ? Color.mSurfaceVariant : Color.mPrimary colorBg: Settings.data.colorSchemes.darkMode ? (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent) : Color.mPrimary
colorFg: Settings.data.colorSchemes.darkMode ? Color.mOnSurface : Color.mOnPrimary colorFg: Settings.data.colorSchemes.darkMode ? Color.mOnSurface : Color.mOnPrimary
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent
onClicked: Settings.data.colorSchemes.darkMode = !Settings.data.colorSchemes.darkMode onClicked: Settings.data.colorSchemes.darkMode = !Settings.data.colorSchemes.darkMode
} }

2
Modules/Bar/Widgets/KeepAwake.qml
View file

@ -15,7 +15,7 @@ NIconButton {
compact: (Settings.data.bar.density === "compact") compact: (Settings.data.bar.density === "compact")
icon: IdleInhibitorService.isInhibited ? "keep-awake-on" : "keep-awake-off" icon: IdleInhibitorService.isInhibited ? "keep-awake-on" : "keep-awake-off"
tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake" : "Enable keep awake" tooltipText: IdleInhibitorService.isInhibited ? "Disable keep awake" : "Enable keep awake"
colorBg: IdleInhibitorService.isInhibited ? Color.mPrimary : Color.mSurfaceVariant colorBg: IdleInhibitorService.isInhibited ? Color.mPrimary : (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
colorFg: IdleInhibitorService.isInhibited ? Color.mOnPrimary : Color.mOnSurface colorFg: IdleInhibitorService.isInhibited ? Color.mOnPrimary : Color.mOnSurface
colorBorder: Color.transparent colorBorder: Color.transparent
onClicked: IdleInhibitorService.manualToggle() onClicked: IdleInhibitorService.manualToggle()

2
Modules/Bar/Widgets/NightLight.qml
View file

@ -16,7 +16,7 @@ NIconButton {
compact: (Settings.data.bar.density === "compact") compact: (Settings.data.bar.density === "compact")
baseSize: Style.capsuleHeight baseSize: Style.capsuleHeight
colorBg: Settings.data.nightLight.forced ? Color.mPrimary : Color.mSurfaceVariant colorBg: Settings.data.nightLight.forced ? Color.mPrimary : (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
colorFg: Settings.data.nightLight.forced ? Color.mOnPrimary : Color.mOnSurface colorFg: Settings.data.nightLight.forced ? Color.mOnPrimary : Color.mOnSurface
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent

2
Modules/Bar/Widgets/NotificationHistory.qml
View file

@ -53,7 +53,7 @@ NIconButton {
compact: (Settings.data.bar.density === "compact") compact: (Settings.data.bar.density === "compact")
icon: Settings.data.notifications.doNotDisturb ? "bell-off" : "bell" icon: Settings.data.notifications.doNotDisturb ? "bell-off" : "bell"
tooltipText: Settings.data.notifications.doNotDisturb ? "Notification history.\nRight-click to disable 'Do Not Disturb'." : "Notification history.\nRight-click to enable 'Do Not Disturb'." tooltipText: Settings.data.notifications.doNotDisturb ? "Notification history.\nRight-click to disable 'Do Not Disturb'." : "Notification history.\nRight-click to enable 'Do Not Disturb'."
colorBg: Color.mSurfaceVariant colorBg: (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
colorFg: Color.mOnSurface colorFg: Color.mOnSurface
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent

2
Modules/Bar/Widgets/PowerProfile.qml
View file

@ -47,7 +47,7 @@ NIconButton {
icon: root.profileIcon() icon: root.profileIcon()
tooltipText: root.profileName() tooltipText: root.profileName()
compact: (Settings.data.bar.density === "compact") compact: (Settings.data.bar.density === "compact")
colorBg: (PowerProfileService.profile === PowerProfile.Balanced) ? Color.mSurfaceVariant : Color.mPrimary colorBg: (PowerProfileService.profile === PowerProfile.Balanced) ? (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent) : Color.mPrimary
colorFg: (PowerProfileService.profile === PowerProfile.Balanced) ? Color.mOnSurface : Color.mOnPrimary colorFg: (PowerProfileService.profile === PowerProfile.Balanced) ? Color.mOnSurface : Color.mOnPrimary
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent

2
Modules/Bar/Widgets/PowerToggle.qml
View file

@ -15,7 +15,7 @@ NIconButton {
baseSize: Style.capsuleHeight baseSize: Style.capsuleHeight
icon: "power" icon: "power"
tooltipText: "Power Settings" tooltipText: "Power Settings"
colorBg: Color.mSurfaceVariant colorBg: (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
colorFg: Color.mError colorFg: Color.mError
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent

2
Modules/Bar/Widgets/SidePanelToggle.qml
View file

@ -35,7 +35,7 @@ NIconButton {
tooltipText: "Open side panel." tooltipText: "Open side panel."
baseSize: Style.capsuleHeight baseSize: Style.capsuleHeight
compact: (Settings.data.bar.density === "compact") compact: (Settings.data.bar.density === "compact")
colorBg: Color.mSurfaceVariant colorBg: (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
colorFg: Color.mOnSurface colorFg: Color.mOnSurface
colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mTertiary colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mTertiary
colorBorder: Color.transparent colorBorder: Color.transparent

2
Modules/Bar/Widgets/WiFi.qml
View file

@ -15,7 +15,7 @@ NIconButton {
compact: (Settings.data.bar.density === "compact") compact: (Settings.data.bar.density === "compact")
baseSize: Style.capsuleHeight baseSize: Style.capsuleHeight
colorBg: Color.mSurfaceVariant colorBg: (Settings.data.bar.showCapsule ? Color.mSurfaceVariant : Color.transparent)
colorFg: Color.mOnSurface colorFg: Color.mOnSurface
colorBorder: Color.transparent colorBorder: Color.transparent
colorBorderHover: Color.transparent colorBorderHover: Color.transparent

2
Widgets/NIconButton.qml
View file

@ -33,7 +33,7 @@ Rectangle {
implicitHeight: Math.round(baseSize * scaling) implicitHeight: Math.round(baseSize * scaling)
opacity: root.enabled ? Style.opacityFull : Style.opacityMedium opacity: root.enabled ? Style.opacityFull : Style.opacityMedium
color: root.enabled && root.hovering ? colorBgHover : Settings.data.bar.showCapsule ? colorBg : Color.transparent color: root.enabled && root.hovering ? colorBgHover : colorBg
radius: width * 0.5 radius: width * 0.5
border.color: root.enabled && root.hovering ? colorBorderHover : colorBorder border.color: root.enabled && root.hovering ? colorBorderHover : colorBorder
border.width: Math.max(1, Style.borderS * scaling) border.width: Math.max(1, Style.borderS * scaling)