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

Formatting + tray menu bg color back to "surface"

Browse source
This commit is contained in:
quadbyte 2025-08-18 09:27:05 -04:00
parent 599b484c42
commit 176a997018
4 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Modules/Bar/SystemMonitor.qml
View file

@ -93,8 +93,7 @@ Row {
} }
} }
} }
}// Row { } // Row {// id: layout
// id: layout
// anchors.verticalCenter: parent.verticalCenter // anchors.verticalCenter: parent.verticalCenter
// spacing: Style.marginSmall * scaling // spacing: Style.marginSmall * scaling
// visible: Settings.data.bar.showSystemInfo // visible: Settings.data.bar.showSystemInfo

2
Modules/Bar/TrayMenu.qml
View file

@ -83,7 +83,7 @@ PopupWindow {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: Color.mSurfaceVariant color: Color.mSurface
border.color: Color.mOutline border.color: Color.mOutline
border.width: Math.max(1, Style.borderThin * scaling) border.width: Math.max(1, Style.borderThin * scaling)
radius: Style.radiusMedium * scaling radius: Style.radiusMedium * scaling

11
Modules/SettingsPanel/Tabs/ColorSchemeTab.qml
View file

@ -23,7 +23,8 @@ ColumnLayout {
if (entry.dark || entry.light) { if (entry.dark || entry.light) {
variant = Settings.data.colorSchemes.darkMode ? (entry.dark || entry.light) : (entry.light || entry.dark) variant = Settings.data.colorSchemes.darkMode ? (entry.dark || entry.light) : (entry.light || entry.dark)
} }
if (variant && variant[colorKey]) return variant[colorKey] if (variant && variant[colorKey])
return variant[colorKey]
} }
// Return a default color if not cached yet // Return a default color if not cached yet
@ -122,9 +123,7 @@ ColumnLayout {
// Dark Mode Toggle (affects both Matugen and predefined schemes that provide variants) // Dark Mode Toggle (affects both Matugen and predefined schemes that provide variants)
NToggle { NToggle {
label: "Dark Mode" label: "Dark Mode"
description: Settings.data.colorSchemes.useWallpaperColors description: Settings.data.colorSchemes.useWallpaperColors ? "Generate dark theme colors when using Matugen. Disable for light theme." : "If the selected predefined scheme has light/dark variants, this chooses which one."
? "Generate dark theme colors when using Matugen. Disable for light theme."
: "If the selected predefined scheme has light/dark variants, this chooses which one."
checked: Settings.data.colorSchemes.darkMode checked: Settings.data.colorSchemes.darkMode
enabled: true enabled: true
onToggled: checked => { onToggled: checked => {
@ -135,7 +134,9 @@ ColumnLayout {
// Re-apply current scheme to pick the right variant // Re-apply current scheme to pick the right variant
ColorSchemeService.applyScheme(Settings.data.colorSchemes.predefinedScheme) ColorSchemeService.applyScheme(Settings.data.colorSchemes.predefinedScheme)
// Force refresh of previews // Force refresh of previews
var tmp = schemeColorsCache; schemeColorsCache = {}; schemeColorsCache = tmp var tmp = schemeColorsCache
schemeColorsCache = {}
schemeColorsCache = tmp
} }
} }
} }

4
Services/ColorSchemeService.qml
View file

@ -113,7 +113,9 @@ Singleton {
} }
function writeColorsToDisk(obj) { function writeColorsToDisk(obj) {
function pick(o, a, b, fallback) { return (o && (o[a] || o[b])) || fallback } function pick(o, a, b, fallback) {
return (o && (o[a] || o[b])) || fallback
}
out.mPrimary = pick(obj, "mPrimary", "primary", out.mPrimary) out.mPrimary = pick(obj, "mPrimary", "primary", out.mPrimary)
out.mOnPrimary = pick(obj, "mOnPrimary", "onPrimary", out.mOnPrimary) out.mOnPrimary = pick(obj, "mOnPrimary", "onPrimary", out.mOnPrimary)
out.mSecondary = pick(obj, "mSecondary", "secondary", out.mSecondary) out.mSecondary = pick(obj, "mSecondary", "secondary", out.mSecondary)