lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Optimize capsule color computation by using Style.qml property

Browse Source
This commit is contained in:
loner
2025-11-17 10:16:33 +08:00
parent a201b8a2c8
commit 24b8eeb1f4
22 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Commons/Style.qml
+3
View File
@@ -104,4 +104,7 @@ Singleton {
return Math.round(barHeight * 0.82);
}
}
readonly property color capsuleColor: Settings.data.bar.showCapsule ?
Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) :
Color.transparent
}
Modules/Bar/Extras/BarPillHorizontal.qml
+1 -1
View File
@@ -78,7 +78,7 @@ Item {
width: root.width
height: pillHeight
radius: halfPillHeight
color: hovered ? Color.mHover : Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: hovered ? Color.mHover : Style.capsuleColor
anchors.verticalCenter: parent.verticalCenter
readonly property int halfPillHeight: Math.round(pillHeight * 0.5)
Modules/Bar/Extras/BarPillVertical.qml
+1 -1
View File
@@ -89,7 +89,7 @@ Item {
width: buttonSize
height: revealed ? (buttonSize + maxPillHeight - pillOverlap) : buttonSize
radius: halfButtonSize
color: hovered ? Color.mHover : Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: hovered ? Color.mHover : Style.capsuleColor
readonly property int halfButtonSize: Math.round(buttonSize * 0.5)
Modules/Bar/Widgets/ActiveWindow.qml
+1 -1
View File
@@ -173,7 +173,7 @@ Item {
width: isVerticalBar ? ((!hasFocusedWindow) && hideMode === "hidden" ? 0 : calculatedVerticalDimension()) : ((!hasFocusedWindow) && (hideMode === "hidden") ? 0 : dynamicWidth)
height: isVerticalBar ? ((!hasFocusedWindow) && hideMode === "hidden" ? 0 : calculatedVerticalDimension()) : Style.capsuleHeight
radius: isVerticalBar ? width / 2 : Style.radiusM
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
// Smooth width transition
Behavior on width {
Modules/Bar/Widgets/AudioVisualizer.qml
+1 -1
View File
@@ -74,7 +74,7 @@ Item {
id: background
anchors.fill: parent
radius: Style.radiusS
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
}
// Store visualizer type to force re-evaluation
Modules/Bar/Widgets/Clock.qml
+1 -1
View File
@@ -46,7 +46,7 @@ Rectangle {
implicitHeight: isBarVertical ? Math.round(verticalLoader.implicitHeight + Style.marginS * 2) : Style.capsuleHeight
radius: Style.radiusS
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
Item {
id: clockContainer
Modules/Bar/Widgets/ControlCenter.qml
+1 -1
View File
@@ -45,7 +45,7 @@ NIconButton {
baseSize: Style.capsuleHeight
applyUiScale: false
density: Settings.data.bar.density
colorBg: (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent)
colorBg: Style.capsuleColor
colorFg: Color.mOnSurface
colorBgHover: useDistroLogo ? Color.mSurfaceVariant : Color.mHover
colorBorder: Color.transparent
Modules/Bar/Widgets/DarkMode.qml
+1 -1
View File
@@ -14,7 +14,7 @@ NIconButton {
density: Settings.data.bar.density
baseSize: Style.capsuleHeight
applyUiScale: false
colorBg: Settings.data.colorSchemes.darkMode ? (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent) : Color.mPrimary
colorBg: Settings.data.colorSchemes.darkMode ? Style.capsuleColor : Color.mPrimary
colorFg: Settings.data.colorSchemes.darkMode ? Color.mOnSurface : Color.mOnPrimary
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/LockKeys.qml
+1 -1
View File
@@ -45,7 +45,7 @@ Rectangle {
Layout.alignment: Qt.AlignVCenter
radius: Style.radiusM
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
Item {
id: layout
Modules/Bar/Widgets/MediaMini.qml
+1 -1
View File
@@ -170,7 +170,7 @@ Item {
width: isVerticalBar ? ((shouldHideIdle || isEmptyForHideMode) ? 0 : calculatedVerticalDimension()) : ((shouldHideIdle || isEmptyForHideMode) ? 0 : dynamicWidth)
height: isVerticalBar ? ((shouldHideIdle || isEmptyForHideMode) ? 0 : calculatedVerticalDimension()) : Style.capsuleHeight
radius: isVerticalBar ? width / 2 : Style.radiusM
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
// Smooth width transition
Behavior on width {
Modules/Bar/Widgets/NightLight.qml
+1 -1
View File
@@ -17,7 +17,7 @@ NIconButton {
density: Settings.data.bar.density
baseSize: Style.capsuleHeight
applyUiScale: false
colorBg: Settings.data.nightLight.forced ? Color.mPrimary : (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent)
colorBg: Settings.data.nightLight.forced ? Color.mPrimary : Style.capsuleColor
colorFg: Settings.data.nightLight.forced ? Color.mOnPrimary : Color.mOnSurface
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/NoctaliaPerformance.qml
+1 -1
View File
@@ -17,7 +17,7 @@ NIconButton {
density: Settings.data.bar.density
baseSize: Style.capsuleHeight
applyUiScale: false
colorBg: PowerProfileService.noctaliaPerformanceMode ? Color.mPrimary : (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent)
colorBg: PowerProfileService.noctaliaPerformanceMode ? Color.mPrimary : Style.capsuleColor
colorFg: PowerProfileService.noctaliaPerformanceMode ? Color.mOnPrimary : Color.mOnSurface
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/NotificationHistory.qml
+1 -1
View File
@@ -51,7 +51,7 @@ NIconButton {
icon: NotificationService.doNotDisturb ? "bell-off" : "bell"
tooltipText: NotificationService.doNotDisturb ? I18n.tr("tooltips.open-notification-history-disable-dnd") : I18n.tr("tooltips.open-notification-history-enable-dnd")
tooltipDirection: BarService.getTooltipDirection()
colorBg: (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent)
colorBg: Style.capsuleColor
colorFg: Color.mOnSurface
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/PowerProfile.qml
+1 -1
View File
@@ -21,7 +21,7 @@ NIconButton {
"profile": PowerProfileService.getName()
})
tooltipDirection: BarService.getTooltipDirection()
colorBg: (PowerProfileService.profile === PowerProfile.Balanced) ? (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent) : Color.mPrimary
colorBg: (PowerProfileService.profile === PowerProfile.Balanced) ? Style.capsuleColor : Color.mPrimary
colorFg: (PowerProfileService.profile === PowerProfile.Balanced) ? Color.mOnSurface : Color.mOnPrimary
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/ScreenRecorder.qml
+1 -1
View File
@@ -17,7 +17,7 @@ NIconButton {
density: Settings.data.bar.density
baseSize: Style.capsuleHeight
applyUiScale: false
colorBg: ScreenRecorderService.isRecording ? Color.mPrimary : (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent)
colorBg: ScreenRecorderService.isRecording ? Color.mPrimary : Style.capsuleColor
colorFg: ScreenRecorderService.isRecording ? Color.mOnPrimary : Color.mOnSurface
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/SessionMenu.qml
+1 -1
View File
@@ -51,7 +51,7 @@ NIconButton {
icon: "power"
tooltipText: I18n.tr("tooltips.session-menu")
tooltipDirection: BarService.getTooltipDirection()
colorBg: (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent)
colorBg: Style.capsuleColor
colorFg: root.iconColor
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/SystemMonitor.qml
+1 -1
View File
@@ -108,7 +108,7 @@ Rectangle {
implicitWidth: isVertical ? Style.capsuleHeight : Math.round(mainGrid.implicitWidth + Style.marginM * 2)
implicitHeight: isVertical ? Math.round(mainGrid.implicitHeight + Style.marginM * 2) : Style.capsuleHeight
radius: Style.radiusM
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
// Status indicator component definition
Component {
Modules/Bar/Widgets/Taskbar.qml
+1 -1
View File
@@ -90,7 +90,7 @@ Rectangle {
implicitWidth: visible ? (isVerticalBar ? Style.capsuleHeight : Math.round(taskbarLayout.implicitWidth + Style.marginM * 2)) : 0
implicitHeight: visible ? (isVerticalBar ? Math.round(taskbarLayout.implicitHeight + Style.marginM * 2) : Style.capsuleHeight) : 0
radius: Style.radiusM
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
GridLayout {
id: taskbarLayout
Modules/Bar/Widgets/TaskbarGrouped.qml
+1 -1
View File
@@ -211,7 +211,7 @@ Item {
border.width: 1
width: (hasWindows ? iconsFlow.implicitWidth : root.itemSize * 0.8) + (root.isVerticalBar ? Style.marginXS : Style.marginL)
height: (hasWindows ? iconsFlow.implicitHeight : root.itemSize * 0.8) + (root.isVerticalBar ? Style.marginL : Style.marginXS)
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
MouseArea {
anchors.fill: parent
Modules/Bar/Widgets/Tray.qml
+3 -3
View File
@@ -225,7 +225,7 @@ Rectangle {
implicitWidth: isVertical ? Style.capsuleHeight : Math.round(trayFlow.implicitWidth)
implicitHeight: isVertical ? Math.round(trayFlow.implicitHeight) : Style.capsuleHeight
radius: Style.radiusM
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
Flow {
id: trayFlow
@@ -241,7 +241,7 @@ Rectangle {
density: Settings.data.bar.density
baseSize: Style.capsuleHeight
applyUiScale: false
colorBg: Settings.data.colorSchemes.darkMode ? (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent) : Color.mPrimary
colorBg: Settings.data.colorSchemes.darkMode ? Style.capsuleColor : Color.mPrimary
colorFg: Settings.data.colorSchemes.darkMode ? Color.mOnSurface : Color.mOnPrimary
colorBorder: Color.transparent
colorBorderHover: Color.transparent
@@ -396,7 +396,7 @@ Rectangle {
density: Settings.data.bar.density
baseSize: Style.capsuleHeight
applyUiScale: false
colorBg: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
colorBg: Style.capsuleColor
colorFg: Color.mOnSurface
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/WallpaperSelector.qml
+1 -1
View File
@@ -16,7 +16,7 @@ NIconButton {
icon: "wallpaper-selector"
tooltipText: I18n.tr("tooltips.open-wallpaper-selector")
tooltipDirection: BarService.getTooltipDirection()
colorBg: (Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent)
colorBg: Style.capsuleColor
colorFg: Color.mOnSurface
colorBorder: Color.transparent
colorBorderHover: Color.transparent
Modules/Bar/Widgets/Workspace.qml
+1 -1
View File
@@ -225,7 +225,7 @@ Item {
width: isVertical ? Style.capsuleHeight : parent.width
height: isVertical ? parent.height : Style.capsuleHeight
radius: Style.radiusM
color: Settings.data.bar.showCapsule ? Qt.alpha(Color.mSurfaceVariant, Settings.data.bar.capsuleOpacity) : Color.transparent
color: Style.capsuleColor
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter