Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-06 05:25:41 -05:00
Code Packages Releases Activity

Surface color overhaul

Browse Source
This commit is contained in:
bbedward
2025-09-25 11:35:43 -04:00
parent 7ccd2d9418
commit 8e103d7ba7
51 changed files with 350 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Common/SettingsData.qml
View File

@@ -130,7 +130,8 @@ Singleton {
property bool topBarGothCornersEnabled: false property bool topBarGothCornersEnabled: false
property bool lockScreenShowPowerActions: true property bool lockScreenShowPowerActions: true
property bool hideBrightnessSlider: false property bool hideBrightnessSlider: false
property string widgetBackgroundColor: "sth" property string widgetBackgroundColor: "sch"
property string surfaceBase: "sc"
property int notificationTimeoutLow: 5000 property int notificationTimeoutLow: 5000
property int notificationTimeoutNormal: 5000 property int notificationTimeoutNormal: 5000
property int notificationTimeoutCritical: 0 property int notificationTimeoutCritical: 0
@@ -323,7 +324,8 @@ Singleton {
topBarGothCornersEnabled = settings.topBarGothCornersEnabled !== undefined ? settings.topBarGothCornersEnabled : false topBarGothCornersEnabled = settings.topBarGothCornersEnabled !== undefined ? settings.topBarGothCornersEnabled : false
lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true lockScreenShowPowerActions = settings.lockScreenShowPowerActions !== undefined ? settings.lockScreenShowPowerActions : true
hideBrightnessSlider = settings.hideBrightnessSlider !== undefined ? settings.hideBrightnessSlider : false hideBrightnessSlider = settings.hideBrightnessSlider !== undefined ? settings.hideBrightnessSlider : false
widgetBackgroundColor = settings.widgetBackgroundColor !== undefined ? settings.widgetBackgroundColor : "sth" widgetBackgroundColor = settings.widgetBackgroundColor !== undefined ? settings.widgetBackgroundColor : "sch"
surfaceBase = settings.surfaceBase !== undefined ? settings.surfaceBase : "sc"
screenPreferences = settings.screenPreferences !== undefined ? settings.screenPreferences : ({}) screenPreferences = settings.screenPreferences !== undefined ? settings.screenPreferences : ({})
applyStoredTheme() applyStoredTheme()
detectAvailableIconThemes() detectAvailableIconThemes()
@@ -433,6 +435,7 @@ Singleton {
"lockScreenShowPowerActions": lockScreenShowPowerActions, "lockScreenShowPowerActions": lockScreenShowPowerActions,
"hideBrightnessSlider": hideBrightnessSlider, "hideBrightnessSlider": hideBrightnessSlider,
"widgetBackgroundColor": widgetBackgroundColor, "widgetBackgroundColor": widgetBackgroundColor,
"surfaceBase": surfaceBase,
"notificationTimeoutLow": notificationTimeoutLow, "notificationTimeoutLow": notificationTimeoutLow,
"notificationTimeoutNormal": notificationTimeoutNormal, "notificationTimeoutNormal": notificationTimeoutNormal,
"notificationTimeoutCritical": notificationTimeoutCritical, "notificationTimeoutCritical": notificationTimeoutCritical,
@@ -1054,6 +1057,14 @@ Singleton {
saveSettings() saveSettings()
} }
function setSurfaceBase(base) {
surfaceBase = base
saveSettings()
if (typeof Theme !== "undefined") {
Theme.generateSystemThemesFromCurrentTheme()
}
}
function setScreenPreferences(prefs) { function setScreenPreferences(prefs) {
screenPreferences = prefs screenPreferences = prefs
saveSettings() saveSettings()

61
Common/StockThemes.js
View File

@@ -10,7 +10,8 @@ const CatppuccinMocha = {
backgroundText: "#cdd6f4", backgroundText: "#cdd6f4",
outline: "#6c7086", outline: "#6c7086",
surfaceContainer: "#313244", surfaceContainer: "#313244",
surfaceContainerHigh: "#585b70" surfaceContainerHigh: "#585b70",
surfaceContainerHighest: "#7f849c"
} }
const CatppuccinLatte = { const CatppuccinLatte = {
@@ -22,7 +23,8 @@ const CatppuccinLatte = {
backgroundText: "#4c4f69", backgroundText: "#4c4f69",
outline: "#9ca0b0", outline: "#9ca0b0",
surfaceContainer: "#ccd0da", surfaceContainer: "#ccd0da",
surfaceContainerHigh: "#acb0be" surfaceContainerHigh: "#acb0be",
surfaceContainerHighest: "#8c8fa1"
} }
const CatppuccinVariants = { const CatppuccinVariants = {
@@ -127,7 +129,8 @@ const StockThemes = {
backgroundText: "#e3e8ef", backgroundText: "#e3e8ef",
outline: "#8e918f", outline: "#8e918f",
surfaceContainer: "#1e2023", surfaceContainer: "#1e2023",
surfaceContainerHigh: "#292b2f" surfaceContainerHigh: "#292b2f",
surfaceContainerHighest: "#343740"
}, },
purple: { purple: {
name: "Purple", name: "Purple",
@@ -144,7 +147,8 @@ const StockThemes = {
backgroundText: "#E6E0E9", backgroundText: "#E6E0E9",
outline: "#938F99", outline: "#938F99",
surfaceContainer: "#1D1B20", surfaceContainer: "#1D1B20",
surfaceContainerHigh: "#2B2930" surfaceContainerHigh: "#2B2930",
surfaceContainerHighest: "#36343B"
}, },
green: { green: {
name: "Green", name: "Green",
@@ -161,7 +165,8 @@ const StockThemes = {
backgroundText: "#e1f5e3", backgroundText: "#e1f5e3",
outline: "#8b938c", outline: "#8b938c",
surfaceContainer: "#1a1f1b", surfaceContainer: "#1a1f1b",
surfaceContainerHigh: "#252a26" surfaceContainerHigh: "#252a26",
surfaceContainerHighest: "#30352f"
}, },
orange: { orange: {
name: "Orange", name: "Orange",
@@ -178,7 +183,8 @@ const StockThemes = {
backgroundText: "#f5f1ea", backgroundText: "#f5f1ea",
outline: "#958f84", outline: "#958f84",
surfaceContainer: "#211e17", surfaceContainer: "#211e17",
surfaceContainerHigh: "#2c291f" surfaceContainerHigh: "#2c291f",
surfaceContainerHighest: "#373427"
}, },
red: { red: {
name: "Red", name: "Red",
@@ -195,7 +201,8 @@ const StockThemes = {
backgroundText: "#f5e8ea", backgroundText: "#f5e8ea",
outline: "#958b8d", outline: "#958b8d",
surfaceContainer: "#211b1c", surfaceContainer: "#211b1c",
surfaceContainerHigh: "#2c2426" surfaceContainerHigh: "#2c2426",
surfaceContainerHighest: "#372f30"
}, },
cyan: { cyan: {
name: "Cyan", name: "Cyan",
@@ -212,7 +219,8 @@ const StockThemes = {
backgroundText: "#e8f4f5", backgroundText: "#e8f4f5",
outline: "#8c9194", outline: "#8c9194",
surfaceContainer: "#1a1f20", surfaceContainer: "#1a1f20",
surfaceContainerHigh: "#252b2c" surfaceContainerHigh: "#252b2c",
surfaceContainerHighest: "#303637"
}, },
pink: { pink: {
name: "Pink", name: "Pink",
@@ -229,7 +237,8 @@ const StockThemes = {
backgroundText: "#f3e8ee", backgroundText: "#f3e8ee",
outline: "#938a90", outline: "#938a90",
surfaceContainer: "#1f1b1e", surfaceContainer: "#1f1b1e",
surfaceContainerHigh: "#2a2428" surfaceContainerHigh: "#2a2428",
surfaceContainerHighest: "#352f32"
}, },
amber: { amber: {
name: "Amber", name: "Amber",
@@ -246,7 +255,8 @@ const StockThemes = {
backgroundText: "#f3f0e8", backgroundText: "#f3f0e8",
outline: "#949084", outline: "#949084",
surfaceContainer: "#1f1e17", surfaceContainer: "#1f1e17",
surfaceContainerHigh: "#2a281f" surfaceContainerHigh: "#2a281f",
surfaceContainerHighest: "#353327"
}, },
coral: { coral: {
name: "Coral", name: "Coral",
@@ -263,7 +273,8 @@ const StockThemes = {
backgroundText: "#f1e8e7", backgroundText: "#f1e8e7",
outline: "#968b8a", outline: "#968b8a",
surfaceContainer: "#201a19", surfaceContainer: "#201a19",
surfaceContainerHigh: "#2b2221" surfaceContainerHigh: "#2b2221",
surfaceContainerHighest: "#362d29"
}, },
monochrome: { monochrome: {
name: "Monochrome", name: "Monochrome",
@@ -281,6 +292,7 @@ const StockThemes = {
outline: "#929092", outline: "#929092",
surfaceContainer: "#2a2a2a", surfaceContainer: "#2a2a2a",
surfaceContainerHigh: "#2a2a2b", surfaceContainerHigh: "#2a2a2b",
surfaceContainerHighest: "#353535",
error: "#ffb4ab", error: "#ffb4ab",
warning: "#3f4759", warning: "#3f4759",
info: "#595e6c", info: "#595e6c",
@@ -303,7 +315,8 @@ const StockThemes = {
backgroundText: "#1a1c1e", backgroundText: "#1a1c1e",
outline: "#79747e", outline: "#79747e",
surfaceContainer: "#f3f3f3", surfaceContainer: "#f3f3f3",
surfaceContainerHigh: "#ececec" surfaceContainerHigh: "#ececec",
surfaceContainerHighest: "#e6e6e6"
}, },
purple: { purple: {
name: "Purple Light", name: "Purple Light",
@@ -320,7 +333,8 @@ const StockThemes = {
backgroundText: "#1C1B1F", backgroundText: "#1C1B1F",
outline: "#79747E", outline: "#79747E",
surfaceContainer: "#F3EDF7", surfaceContainer: "#F3EDF7",
surfaceContainerHigh: "#ECE6F0" surfaceContainerHigh: "#ECE6F0",
surfaceContainerHighest: "#E6DFE9"
}, },
green: { green: {
name: "Green Light", name: "Green Light",
@@ -337,7 +351,8 @@ const StockThemes = {
backgroundText: "#1a1c1e", backgroundText: "#1a1c1e",
outline: "#79747e", outline: "#79747e",
surfaceContainer: "#f3f3f3", surfaceContainer: "#f3f3f3",
surfaceContainerHigh: "#ececec" surfaceContainerHigh: "#ececec",
surfaceContainerHighest: "#e6e6e6"
}, },
orange: { orange: {
name: "Orange Light", name: "Orange Light",
@@ -354,7 +369,8 @@ const StockThemes = {
backgroundText: "#1a1c1e", backgroundText: "#1a1c1e",
outline: "#79747e", outline: "#79747e",
surfaceContainer: "#f3f3f3", surfaceContainer: "#f3f3f3",
surfaceContainerHigh: "#ececec" surfaceContainerHigh: "#ececec",
surfaceContainerHighest: "#e6e6e6"
}, },
red: { red: {
name: "Red Light", name: "Red Light",
@@ -371,7 +387,8 @@ const StockThemes = {
backgroundText: "#1a1c1e", backgroundText: "#1a1c1e",
outline: "#79747e", outline: "#79747e",
surfaceContainer: "#f3f3f3", surfaceContainer: "#f3f3f3",
surfaceContainerHigh: "#ececec" surfaceContainerHigh: "#ececec",
surfaceContainerHighest: "#e6e6e6"
}, },
cyan: { cyan: {
name: "Cyan Light", name: "Cyan Light",
@@ -388,7 +405,8 @@ const StockThemes = {
backgroundText: "#1a1c1e", backgroundText: "#1a1c1e",
outline: "#79747e", outline: "#79747e",
surfaceContainer: "#f3f3f3", surfaceContainer: "#f3f3f3",
surfaceContainerHigh: "#ececec" surfaceContainerHigh: "#ececec",
surfaceContainerHighest: "#e6e6e6"
}, },
pink: { pink: {
name: "Pink Light", name: "Pink Light",
@@ -405,7 +423,8 @@ const StockThemes = {
backgroundText: "#1a1c1e", backgroundText: "#1a1c1e",
outline: "#79747e", outline: "#79747e",
surfaceContainer: "#f3f3f3", surfaceContainer: "#f3f3f3",
surfaceContainerHigh: "#ececec" surfaceContainerHigh: "#ececec",
surfaceContainerHighest: "#e6e6e6"
}, },
amber: { amber: {
name: "Amber Light", name: "Amber Light",
@@ -422,7 +441,8 @@ const StockThemes = {
backgroundText: "#1a1c1e", backgroundText: "#1a1c1e",
outline: "#79747e", outline: "#79747e",
surfaceContainer: "#f3f3f3", surfaceContainer: "#f3f3f3",
surfaceContainerHigh: "#ececec" surfaceContainerHigh: "#ececec",
surfaceContainerHighest: "#e6e6e6"
}, },
coral: { coral: {
name: "Coral Light", name: "Coral Light",
@@ -439,7 +459,8 @@ const StockThemes = {
backgroundText: "#1a1c1e", backgroundText: "#1a1c1e",
outline: "#79747e", outline: "#79747e",
surfaceContainer: "#f3f3f3", surfaceContainer: "#f3f3f3",
surfaceContainerHigh: "#ececec" surfaceContainerHigh: "#ececec",
surfaceContainerHighest: "#e6e6e6"
}, },
monochrome: { monochrome: {
name: "Monochrome Light", name: "Monochrome Light",

35
Common/Theme.qml
View File

@@ -120,6 +120,7 @@ Singleton {
"outline": getMatugenColor("outline", "#8e918f"), "outline": getMatugenColor("outline", "#8e918f"),
"surfaceContainer": getMatugenColor("surface_container", "#1e2023"), "surfaceContainer": getMatugenColor("surface_container", "#1e2023"),
"surfaceContainerHigh": getMatugenColor("surface_container_high", "#292b2f"), "surfaceContainerHigh": getMatugenColor("surface_container_high", "#292b2f"),
"surfaceContainerHighest": getMatugenColor("surface_container_highest", "#343740"),
"error": "#F2B8B5", "error": "#F2B8B5",
"warning": "#FF9800", "warning": "#FF9800",
"info": "#2196F3", "info": "#2196F3",
@@ -154,7 +155,12 @@ Singleton {
property color primaryText: currentThemeData.primaryText property color primaryText: currentThemeData.primaryText
property color primaryContainer: currentThemeData.primaryContainer property color primaryContainer: currentThemeData.primaryContainer
property color secondary: currentThemeData.secondary property color secondary: currentThemeData.secondary
property color surface: currentThemeData.surface property color surface: {
if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
return currentThemeData.background
}
return currentThemeData.surface
}
property color surfaceText: currentThemeData.surfaceText property color surfaceText: currentThemeData.surfaceText
property color surfaceVariant: currentThemeData.surfaceVariant property color surfaceVariant: currentThemeData.surfaceVariant
property color surfaceVariantText: currentThemeData.surfaceVariantText property color surfaceVariantText: currentThemeData.surfaceVariantText
@@ -163,8 +169,24 @@ Singleton {
property color backgroundText: currentThemeData.backgroundText property color backgroundText: currentThemeData.backgroundText
property color outline: currentThemeData.outline property color outline: currentThemeData.outline
property color outlineVariant: currentThemeData.outlineVariant || Qt.rgba(outline.r, outline.g, outline.b, 0.6) property color outlineVariant: currentThemeData.outlineVariant || Qt.rgba(outline.r, outline.g, outline.b, 0.6)
property color surfaceContainer: currentThemeData.surfaceContainer property color surfaceContainer: {
property color surfaceContainerHigh: currentThemeData.surfaceContainerHigh if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
return currentThemeData.surface
}
return currentThemeData.surfaceContainer
}
property color surfaceContainerHigh: {
if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
return currentThemeData.surfaceContainer
}
return currentThemeData.surfaceContainerHigh
}
property color surfaceContainerHighest: {
if (typeof SettingsData !== "undefined" && SettingsData.surfaceBase === "s") {
return currentThemeData.surfaceContainerHigh
}
return currentThemeData.surfaceContainerHighest
}
property color onSurface: surfaceText property color onSurface: surfaceText
property color onSurfaceVariant: surfaceVariantText property color onSurfaceVariant: surfaceVariantText
@@ -367,7 +389,7 @@ Singleton {
property real notepadTransparency: SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : popupTransparency property real notepadTransparency: SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : popupTransparency
property var widgetBaseBackgroundColor: { property var widgetBaseBackgroundColor: {
const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sth" const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sch"
switch (colorMode) { switch (colorMode) {
case "s": case "s":
return surface return surface
@@ -388,7 +410,7 @@ Singleton {
} }
property var widgetBackground: { property var widgetBackground: {
const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sth" const colorMode = typeof SettingsData !== "undefined" ? SettingsData.widgetBackgroundColor : "sch"
switch (colorMode) { switch (colorMode) {
case "s": case "s":
return Qt.rgba(surface.r, surface.g, surface.b, widgetTransparency) return Qt.rgba(surface.r, surface.g, surface.b, widgetTransparency)
@@ -541,7 +563,8 @@ Singleton {
"value": value, "value": value,
"mode": isLight ? "light" : "dark", "mode": isLight ? "light" : "dark",
"iconTheme": iconTheme || "System Default", "iconTheme": iconTheme || "System Default",
"matugenType": matugenType || "scheme-tonal-spot" "matugenType": matugenType || "scheme-tonal-spot",
"surfaceBase": (typeof SettingsData !== "undefined" && SettingsData.surfaceBase) ? SettingsData.surfaceBase : "sc"
} }
const json = JSON.stringify(desired) const json = JSON.stringify(desired)

4
Modals/ProcessListModal.qml
View File

@@ -181,7 +181,7 @@ DankModal {
Rectangle { Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
height: 52 height: 52
color: Theme.surfaceSelected color: Theme.surfaceContainerHigh
radius: Theme.cornerRadius radius: Theme.cornerRadius
border.color: Theme.outlineLight border.color: Theme.outlineLight
border.width: 1 border.width: 1
@@ -281,7 +281,7 @@ DankModal {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceLight color: Theme.surfaceContainerHigh
border.color: Theme.outlineLight border.color: Theme.outlineLight
border.width: 1 border.width: 1

2
Modals/Settings/PowerSettings.qml
View File

@@ -31,7 +31,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: timeoutSection id: timeoutSection

2
Modals/Spotlight/SpotlightContent.qml
View File

@@ -95,7 +95,7 @@ Item {
width: parent.width - 80 - Theme.spacingM width: parent.width - 80 - Theme.spacingM
height: 56 height: 56
cornerRadius: Theme.cornerRadius cornerRadius: Theme.cornerRadius
backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.7) backgroundColor: Theme.surfaceContainerHigh
normalBorderColor: Theme.outlineMedium normalBorderColor: Theme.outlineMedium
focusedBorderColor: Theme.primary focusedBorderColor: Theme.primary
leftIconName: "search" leftIconName: "search"

6
Modals/Spotlight/SpotlightResults.qml
View File

@@ -13,7 +13,7 @@ Rectangle {
width: parent.width width: parent.width
height: parent.height - y height: parent.height - y
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceLight color: Theme.surfaceContainerHigh
border.color: Theme.outlineLight border.color: Theme.outlineLight
border.width: 1 border.width: 1
@@ -75,7 +75,7 @@ Rectangle {
width: ListView.view.width width: ListView.view.width
height: resultsList.itemHeight height: resultsList.itemHeight
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.03) color: ListView.isCurrentItem ? Theme.primaryPressed : listMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent"
border.color: ListView.isCurrentItem ? Theme.primarySelected : Theme.outlineMedium border.color: ListView.isCurrentItem ? Theme.primarySelected : Theme.outlineMedium
border.width: ListView.isCurrentItem ? 2 : 1 border.width: ListView.isCurrentItem ? 2 : 1
@@ -238,7 +238,7 @@ Rectangle {
width: resultsGrid.cellWidth - resultsGrid.cellPadding width: resultsGrid.cellWidth - resultsGrid.cellPadding
height: resultsGrid.cellHeight - resultsGrid.cellPadding height: resultsGrid.cellHeight - resultsGrid.cellPadding
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: resultsGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.03) color: resultsGrid.currentIndex === index ? Theme.primaryPressed : gridMouseArea.containsMouse ? Theme.primaryHoverLight : "transparent"
border.color: resultsGrid.currentIndex === index ? Theme.primarySelected : Theme.outlineMedium border.color: resultsGrid.currentIndex === index ? Theme.primarySelected : Theme.outlineMedium
border.width: resultsGrid.currentIndex === index ? 2 : 1 border.width: resultsGrid.currentIndex === index ? 2 : 1

3
Modules/ControlCenter/Components/ActionTile.qml
View File

@@ -25,8 +25,7 @@ Rectangle {
readonly property color _tileBgActive: Theme.primary readonly property color _tileBgActive: Theme.primary
readonly property color _tileBgInactive: readonly property color _tileBgInactive:
Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.surfaceContainerHigh
Theme.getContentBackgroundAlpha() * 0.60)
readonly property color _tileRingActive: readonly property color _tileRingActive:
Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22) Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22)

2
Modules/ControlCenter/Components/EditControls.qml
View File

@@ -72,7 +72,7 @@ Row {
width: 400 - Theme.spacingL * 2 width: 400 - Theme.spacingL * 2
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: widgetMouseArea.containsMouse ? Theme.primaryHover : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: widgetMouseArea.containsMouse ? Theme.primaryHover : Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 1

5
Modules/ControlCenter/Components/HeaderPane.qml
View File

@@ -15,10 +15,7 @@ Rectangle {
implicitHeight: 70 implicitHeight: 70
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.g,
Theme.surfaceVariant.b,
Theme.getContentBackgroundAlpha() * 0.4)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.08) Theme.outline.b, 0.08)
border.width: 1 border.width: 1

5
Modules/ControlCenter/Components/PowerOptionsPane.qml
View File

@@ -18,10 +18,7 @@ Item {
width: parent.width width: parent.width
height: 60 height: 60
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.g,
Theme.surfaceVariant.b,
Theme.getContentBackgroundAlpha() * 0.4)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.08) Theme.outline.b, 0.08)
border.width: root.expanded ? 1 : 0 border.width: root.expanded ? 1 : 0

6
Modules/ControlCenter/Components/WidgetGrid.qml
View File

@@ -418,7 +418,7 @@ Column {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width width: parent.width
height: 14 height: 14
property color sliderTrackColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.60) property color sliderTrackColor: Theme.surfaceContainerHigh
} }
EditModeOverlay { EditModeOverlay {
@@ -447,7 +447,7 @@ Column {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width width: parent.width
height: 14 height: 14
property color sliderTrackColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.60) property color sliderTrackColor: Theme.surfaceContainerHigh
} }
EditModeOverlay { EditModeOverlay {
@@ -476,7 +476,7 @@ Column {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width width: parent.width
height: 14 height: 14
property color sliderTrackColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.60) property color sliderTrackColor: Theme.surfaceContainerHigh
} }
EditModeOverlay { EditModeOverlay {

2
Modules/ControlCenter/ControlCenterPopout.qml
View File

@@ -49,7 +49,7 @@ DankPopout {
} }
} }
readonly property color _containerBg: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.60) readonly property color _containerBg: Theme.surfaceContainerHigh
function setTriggerPosition(x, y, width, section, screen) { function setTriggerPosition(x, y, width, section, screen) {
StateUtils.setTriggerPosition(root, x, y, width, section, screen) StateUtils.setTriggerPosition(root, x, y, width, section, screen)

4
Modules/ControlCenter/Details/AudioInputDetail.qml
View File

@@ -14,7 +14,7 @@ Rectangle {
implicitHeight: headerRow.height + (hasInputVolumeSliderInCC ? 0 : volumeSlider.height) + audioContent.height + Theme.spacingM implicitHeight: headerRow.height + (hasInputVolumeSliderInCC ? 0 : volumeSlider.height) + audioContent.height + Theme.spacingM
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.6) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1
@@ -138,7 +138,7 @@ Rectangle {
width: parent.width width: parent.width
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, index % 2 === 0 ? 0.3 : 0.2) color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh
border.color: modelData === AudioService.source ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData === AudioService.source ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: modelData === AudioService.source ? 2 : 1 border.width: modelData === AudioService.source ? 2 : 1

4
Modules/ControlCenter/Details/AudioOutputDetail.qml
View File

@@ -14,7 +14,7 @@ Rectangle {
implicitHeight: headerRow.height + (!hasVolumeSliderInCC ? volumeSlider.height : 0) + audioContent.height + Theme.spacingM implicitHeight: headerRow.height + (!hasVolumeSliderInCC ? volumeSlider.height : 0) + audioContent.height + Theme.spacingM
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.6) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1
@@ -143,7 +143,7 @@ Rectangle {
width: parent.width width: parent.width
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, index % 2 === 0 ? 0.3 : 0.2) color: deviceMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh
border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: modelData === AudioService.sink ? 2 : 1 border.width: modelData === AudioService.sink ? 2 : 1

12
Modules/ControlCenter/Details/BatteryDetail.qml
View File

@@ -9,7 +9,7 @@ import qs.Widgets
Rectangle { Rectangle {
implicitHeight: contentColumn.implicitHeight + Theme.spacingL * 2 implicitHeight: contentColumn.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.6) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1
@@ -125,9 +125,8 @@ Rectangle {
width: (parent.width - Theme.spacingM) / 2 width: (parent.width - Theme.spacingM) / 2
height: 64 height: 64
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) color: Theme.surfaceContainerHighest
border.color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.2) border.width: 0
border.width: 1
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent
@@ -161,9 +160,8 @@ Rectangle {
width: (parent.width - Theme.spacingM) / 2 width: (parent.width - Theme.spacingM) / 2
height: 64 height: 64
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) color: Theme.surfaceContainerHighest
border.color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.2) border.width: 0
border.width: 1
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent

8
Modules/ControlCenter/Details/BluetoothDetail.qml
View File

@@ -9,7 +9,7 @@ import qs.Widgets
Rectangle { Rectangle {
implicitHeight: BluetoothService.adapter && BluetoothService.adapter.enabled ? headerRow.height + bluetoothContent.height + Theme.spacingM : headerRow.height implicitHeight: BluetoothService.adapter && BluetoothService.adapter.enabled ? headerRow.height + bluetoothContent.height + Theme.spacingM : headerRow.height
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.6) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1
@@ -58,7 +58,7 @@ Rectangle {
radius: 18 radius: 18
color: { color: {
if (!BluetoothService.adapter || !BluetoothService.adapter.enabled) if (!BluetoothService.adapter || !BluetoothService.adapter.enabled)
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) return Theme.surfaceContainerHigh
return scanMouseArea.containsMouse ? Theme.surfaceContainerHigh : "transparent" return scanMouseArea.containsMouse ? Theme.surfaceContainerHigh : "transparent"
} }
border.color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: BluetoothService.adapter && BluetoothService.adapter.enabled ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
@@ -159,7 +159,7 @@ Rectangle {
return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12) return Qt.rgba(Theme.warning.r, Theme.warning.g, Theme.warning.b, 0.12)
if (deviceMouseArea.containsMouse) if (deviceMouseArea.containsMouse)
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08)
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, index % 2 === 0 ? 0.3 : 0.2) return Theme.surfaceContainerHigh
} }
border.color: { border.color: {
if (modelData.state === BluetoothDeviceState.Connecting) if (modelData.state === BluetoothDeviceState.Connecting)
@@ -347,7 +347,7 @@ Rectangle {
width: parent.width width: parent.width
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: availableMouseArea.containsMouse && !isBusy ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.15) color: availableMouseArea.containsMouse && !isBusy ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: 1 border.width: 1
opacity: canConnect ? 1 : 0.6 opacity: canConnect ? 1 : 0.6

4
Modules/ControlCenter/Details/DiskUsageDetail.qml
View File

@@ -13,7 +13,7 @@ Rectangle {
implicitHeight: diskContent.height + Theme.spacingM implicitHeight: diskContent.height + Theme.spacingM
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.6) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1
@@ -76,7 +76,7 @@ Rectangle {
width: parent.width width: parent.width
height: 80 height: 80
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, index % 2 === 0 ? 0.3 : 0.2) color: Theme.surfaceContainerHigh
border.color: modelData.mount === currentMountPath ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData.mount === currentMountPath ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: modelData.mount === currentMountPath ? 2 : 1 border.width: modelData.mount === currentMountPath ? 2 : 1

4
Modules/ControlCenter/Details/NetworkDetail.qml
View File

@@ -17,7 +17,7 @@ Rectangle {
return headerRow.height + wifiOffContent.height + Theme.spacingM return headerRow.height + wifiOffContent.height + Theme.spacingM
} }
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.6) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1
@@ -242,7 +242,7 @@ Rectangle {
width: parent.width width: parent.width
height: 50 height: 50
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, index % 2 === 0 ? 0.3 : 0.2) color: networkMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) : Theme.surfaceContainerHigh
border.color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12) border.color: modelData.ssid === NetworkService.currentWifiSSID ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.12)
border.width: modelData.ssid === NetworkService.currentWifiSSID ? 2 : 1 border.width: modelData.ssid === NetworkService.currentWifiSSID ? 2 : 1

2
Modules/ControlCenter/Widgets/AudioSliderRow.qml
View File

@@ -70,7 +70,7 @@ Row {
unit: "%" unit: "%"
valueOverride: actualVolumePercent valueOverride: actualVolumePercent
thumbOutlineColor: Theme.surfaceContainer thumbOutlineColor: Theme.surfaceContainer
trackColor: root.sliderTrackColor.a > 0 ? root.sliderTrackColor : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.60) trackColor: root.sliderTrackColor.a > 0 ? root.sliderTrackColor : Theme.surfaceContainerHigh
onSliderValueChanged: function(newValue) { onSliderValueChanged: function(newValue) {
if (defaultSink) { if (defaultSink) {
defaultSink.audio.volume = newValue / 100.0 defaultSink.audio.volume = newValue / 100.0

2
Modules/ControlCenter/Widgets/BrightnessSliderRow.qml
View File

@@ -80,7 +80,7 @@ Row {
} }
} }
thumbOutlineColor: Theme.surfaceContainer thumbOutlineColor: Theme.surfaceContainer
trackColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.60) trackColor: Theme.surfaceContainerHigh
} }
Menu { Menu {

2
Modules/ControlCenter/Widgets/CompactSlider.qml
View File

@@ -20,7 +20,7 @@ Rectangle {
width: parent ? parent.width : 200 width: parent ? parent.width : 200
height: 60 height: 60
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.6) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1
opacity: enabled ? 1.0 : 0.6 opacity: enabled ? 1.0 : 0.6

4
Modules/ControlCenter/Widgets/CompoundPill.qml
View File

@@ -27,9 +27,7 @@ Rectangle {
return Theme.isLightMode ? Qt.darker(base, factor) : Qt.lighter(base, factor) return Theme.isLightMode ? Qt.darker(base, factor) : Qt.lighter(base, factor)
} }
readonly property color _containerBg: readonly property color _containerBg: Theme.surfaceContainerHigh
Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b,
Theme.getContentBackgroundAlpha() * 0.60)
color: _containerBg color: _containerBg
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.10) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.10)

2
Modules/ControlCenter/Widgets/InputAudioSliderRow.qml
View File

@@ -68,7 +68,7 @@ Row {
unit: "%" unit: "%"
valueOverride: actualVolumePercent valueOverride: actualVolumePercent
thumbOutlineColor: Theme.surfaceContainer thumbOutlineColor: Theme.surfaceContainer
trackColor: root.sliderTrackColor.a > 0 ? root.sliderTrackColor : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, Theme.getContentBackgroundAlpha() * 0.60) trackColor: root.sliderTrackColor.a > 0 ? root.sliderTrackColor : Theme.surfaceContainerHigh
onSliderValueChanged: function(newValue) { onSliderValueChanged: function(newValue) {
if (defaultSource) { if (defaultSource) {
defaultSource.audio.volume = newValue / 100.0 defaultSource.audio.volume = newValue / 100.0

4
Modules/ControlCenter/Widgets/SmallBatteryButton.qml
View File

@@ -25,9 +25,7 @@ Rectangle {
} }
readonly property color _tileBgActive: Theme.primary readonly property color _tileBgActive: Theme.primary
readonly property color _tileBgInactive: readonly property color _tileBgInactive: Theme.surfaceContainerHigh
Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b,
Theme.getContentBackgroundAlpha() * 0.60)
readonly property color _tileRingActive: readonly property color _tileRingActive:
Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22) Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22)
readonly property color _tileIconActive: Theme.primaryContainer readonly property color _tileIconActive: Theme.primaryContainer

4
Modules/ControlCenter/Widgets/SmallToggleButton.qml
View File

@@ -26,9 +26,7 @@ Rectangle {
} }
readonly property color _tileBgActive: Theme.primary readonly property color _tileBgActive: Theme.primary
readonly property color _tileBgInactive: readonly property color _tileBgInactive: Theme.surfaceContainerHigh
Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b,
Theme.getContentBackgroundAlpha() * 0.60)
readonly property color _tileRingActive: readonly property color _tileRingActive:
Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22) Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22)
readonly property color _tileIconActive: Theme.primaryContainer readonly property color _tileIconActive: Theme.primaryContainer

8
Modules/ControlCenter/Widgets/ToggleButton.qml
View File

@@ -23,9 +23,7 @@ Rectangle {
} }
readonly property color _tileBgActive: Theme.primary readonly property color _tileBgActive: Theme.primary
readonly property color _tileBgInactive: readonly property color _tileBgInactive: Theme.surfaceContainerHigh
Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b,
Theme.getContentBackgroundAlpha() * 0.60)
readonly property color _tileRingActive: readonly property color _tileRingActive:
Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22) Qt.rgba(Theme.primaryText.r, Theme.primaryText.g, Theme.primaryText.b, 0.22)
@@ -39,9 +37,7 @@ Rectangle {
return Theme.isLightMode ? Qt.darker(base, factor) : Qt.lighter(base, factor) return Theme.isLightMode ? Qt.darker(base, factor) : Qt.lighter(base, factor)
} }
readonly property color _containerBg: readonly property color _containerBg: Theme.surfaceContainerHigh
Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b,
Theme.getContentBackgroundAlpha() * 0.60)
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent

10
Modules/DankDash/MediaPlayerTab.qml
View File

@@ -420,7 +420,7 @@ Item {
width: parent.width width: parent.width
height: 48 height: 48
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: deviceMouseAreaLeft.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, index % 2 === 0 ? 0.3 : 0.2) color: deviceMouseAreaLeft.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.surfaceContainerHigh
border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: modelData === AudioService.sink ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: modelData === AudioService.sink ? 2 : 1 border.width: modelData === AudioService.sink ? 2 : 1
@@ -563,7 +563,7 @@ Item {
width: parent.width width: parent.width
height: 48 height: 48
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: playerMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, index % 2 === 0 ? 0.3 : 0.2) color: playerMouseArea.containsMouse ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) : Theme.surfaceContainerHigh
border.color: modelData === activePlayer ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: modelData === activePlayer ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: modelData === activePlayer ? 2 : 1 border.width: modelData === activePlayer ? 2 : 1
@@ -837,7 +837,7 @@ Item {
width: 40 width: 40
height: 40 height: 40
radius: 20 radius: 20
color: prevBtnArea.containsMouse ? Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.12) : "transparent" color: prevBtnArea.containsMouse ? Theme.surfaceContainerHigh : "transparent"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
DankIcon { DankIcon {
@@ -903,7 +903,7 @@ Item {
width: 40 width: 40
height: 40 height: 40
radius: 20 radius: 20
color: nextBtnArea.containsMouse ? Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.12) : "transparent" color: nextBtnArea.containsMouse ? Theme.surfaceContainerHigh : "transparent"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
DankIcon { DankIcon {
@@ -1115,7 +1115,7 @@ Item {
width: parent.width width: parent.width
height: parent.height height: parent.height
anchors.centerIn: parent anchors.centerIn: parent
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5) color: Theme.surfaceContainerHigh
radius: Theme.cornerRadius radius: Theme.cornerRadius
} }

4
Modules/DankDash/Overview/CalendarOverviewCard.qml
View File

@@ -84,7 +84,7 @@ Rectangle {
} }
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.1) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05)
border.width: 1 border.width: 1
@@ -345,7 +345,7 @@ Rectangle {
} else if (eventMouseArea.containsMouse) { } else if (eventMouseArea.containsMouse) {
return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06) return Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.06)
} }
return Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.04) return Theme.surfaceContainerHigh
} }
border.color: { border.color: {
if (modelData.url && eventMouseArea.containsMouse) { if (modelData.url && eventMouseArea.containsMouse) {

2
Modules/DankDash/Overview/Card.qml
View File

@@ -8,7 +8,7 @@ Rectangle {
property int pad: Theme.spacingM property int pad: Theme.spacingM
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.2) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1

4
Modules/DankDash/Overview/MediaOverviewCard.qml
View File

@@ -131,7 +131,7 @@ Card {
height: 28 height: 28
radius: 14 radius: 14
anchors.verticalCenter: playPauseButton.verticalCenter anchors.verticalCenter: playPauseButton.verticalCenter
color: prevArea.containsMouse ? Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.12) : "transparent" color: prevArea.containsMouse ? Theme.surfaceContainerHigh : "transparent"
DankIcon { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent
@@ -183,7 +183,7 @@ Card {
height: 28 height: 28
radius: 14 radius: 14
anchors.verticalCenter: playPauseButton.verticalCenter anchors.verticalCenter: playPauseButton.verticalCenter
color: nextArea.containsMouse ? Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.12) : "transparent" color: nextArea.containsMouse ? Theme.surfaceContainerHigh : "transparent"
DankIcon { DankIcon {
anchors.centerIn: parent anchors.centerIn: parent

14
Modules/DankDash/WeatherTab.qml
View File

@@ -231,7 +231,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent
@@ -278,7 +278,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent
@@ -325,7 +325,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent
@@ -372,7 +372,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent
@@ -419,7 +419,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent
@@ -466,7 +466,7 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent
@@ -554,7 +554,7 @@ Item {
return null return null
} }
color: isToday ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.1) color: isToday ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.1) : Theme.surfaceContainerHigh
border.color: isToday ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3) : "transparent" border.color: isToday ? Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.3) : "transparent"
border.width: isToday ? 1 : 0 border.width: isToday ? 1 : 0

8
Modules/ProcessList/PerformanceTab.qml
View File

@@ -40,7 +40,7 @@ Column {
width: parent.width width: parent.width
height: 200 height: 200
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.04) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
border.width: 1 border.width: 1
@@ -180,7 +180,7 @@ Column {
width: parent.width width: parent.width
height: 80 height: 80
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.04) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
border.width: 1 border.width: 1
@@ -350,7 +350,7 @@ Column {
width: (parent.width - Theme.spacingM) / 2 width: (parent.width - Theme.spacingM) / 2
height: 80 height: 80
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.04) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
border.width: 1 border.width: 1
@@ -416,7 +416,7 @@ Column {
width: (parent.width - Theme.spacingM) / 2 width: (parent.width - Theme.spacingM) / 2
height: 80 height: 80
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.04) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.06)
border.width: 1 border.width: 1

4
Modules/ProcessList/ProcessListPopout.qml
View File

@@ -100,7 +100,7 @@ DankPopout {
Layout.fillWidth: true Layout.fillWidth: true
height: systemOverview.height + Theme.spacingM * 2 height: systemOverview.height + Theme.spacingM * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.2) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 1
@@ -117,7 +117,7 @@ DankPopout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.1) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.05)
border.width: 1 border.width: 1

4
Modules/ProcessList/SystemTab.qml
View File

@@ -24,7 +24,7 @@ DankFlickable {
width: parent.width width: parent.width
height: systemInfoColumn.implicitHeight + 2 * Theme.spacingL height: systemInfoColumn.implicitHeight + 2 * Theme.spacingL
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.6) color: Theme.surfaceContainerHigh
border.width: 0 border.width: 0
Column { Column {
@@ -386,7 +386,7 @@ DankFlickable {
width: parent.width width: parent.width
height: storageColumn.implicitHeight + 2 * Theme.spacingL height: storageColumn.implicitHeight + 2 * Theme.spacingL
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, Theme.surfaceContainer.b, 0.6) color: Theme.surfaceContainerHigh
border.width: 0 border.width: 0
Column { Column {

17
Modules/Settings/AboutTab.qml
View File

@@ -28,11 +28,10 @@ Item {
width: parent.width width: parent.width
height: asciiSection.implicitHeight + Theme.spacingL * 2 height: asciiSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: asciiSection id: asciiSection
@@ -225,11 +224,10 @@ Item {
width: parent.width width: parent.width
height: projectSection.implicitHeight + Theme.spacingL * 2 height: projectSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: projectSection id: projectSection
@@ -285,11 +283,10 @@ Item {
width: parent.width width: parent.width
height: techSection.implicitHeight + Theme.spacingL * 2 height: techSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: techSection id: techSection
@@ -510,7 +507,7 @@ Item {
color: Theme.surfaceContainer color: Theme.surfaceContainer
radius: Theme.cornerRadius radius: Theme.cornerRadius
border.width: 1 border.width: 0
border.color: Theme.outlineMedium border.color: Theme.outlineMedium
x: hoveredButton ? hoveredButton.mapToItem(aboutTab, hoveredButton.width / 2, 0).x - width / 2 : 0 x: hoveredButton ? hoveredButton.mapToItem(aboutTab, hoveredButton.width / 2, 0).x - width / 2 : 0

10
Modules/Settings/DisplaysTab.qml
View File

@@ -80,9 +80,9 @@ Item {
width: parent.width width: parent.width
height: screensInfoSection.implicitHeight + Theme.spacingL * 2 height: screensInfoSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: screensInfoSection id: screensInfoSection
@@ -146,7 +146,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceContainerHigh color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3)
border.width: 1 border.width: 0
Row { Row {
id: screenRow id: screenRow
@@ -222,9 +222,9 @@ Item {
width: parent.width width: parent.width
height: componentSection.implicitHeight + Theme.spacingL * 2 height: componentSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: componentSection id: componentSection

21
Modules/Settings/DockTab.qml
View File

@@ -24,11 +24,10 @@ Item {
width: parent.width width: parent.width
height: enableDockSection.implicitHeight + Theme.spacingL * 2 height: enableDockSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: enableDockSection id: enableDockSection
@@ -88,11 +87,10 @@ Item {
width: parent.width width: parent.width
height: autoHideSection.implicitHeight + Theme.spacingL * 2 height: autoHideSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
visible: SettingsData.showDock visible: SettingsData.showDock
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0
@@ -161,11 +159,10 @@ Item {
width: parent.width width: parent.width
height: groupByAppSection.implicitHeight + Theme.spacingL * 2 height: groupByAppSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
visible: SettingsData.showDock visible: SettingsData.showDock
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0
@@ -234,11 +231,10 @@ Item {
width: parent.width width: parent.width
height: transparencySection.implicitHeight + Theme.spacingL * 2 height: transparencySection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
visible: SettingsData.showDock visible: SettingsData.showDock
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0
@@ -278,6 +274,7 @@ Item {
unit: "%" unit: "%"
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setDockTransparency( SettingsData.setDockTransparency(
newValue / 100) newValue / 100)

12
Modules/Settings/LauncherTab.qml
View File

@@ -23,11 +23,10 @@ Item {
width: parent.width width: parent.width
height: launchPrefixSection.implicitHeight + Theme.spacingL * 2 height: launchPrefixSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: launchPrefixSection id: launchPrefixSection
@@ -79,11 +78,10 @@ Item {
width: parent.width width: parent.width
height: recentlyUsedSection.implicitHeight + Theme.spacingL * 2 height: recentlyUsedSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: recentlyUsedSection id: recentlyUsedSection
@@ -184,7 +182,7 @@ Item {
border.color: Qt.rgba(Theme.outline.r, border.color: Qt.rgba(Theme.outline.r,
Theme.outline.g, Theme.outline.g,
Theme.outline.b, 0.1) Theme.outline.b, 0.1)
border.width: 1 border.width: 0
Row { Row {
anchors.left: parent.left anchors.left: parent.left

34
Modules/Settings/PersonalizationTab.qml
View File

@@ -96,9 +96,9 @@ Item {
width: parent.width width: parent.width
height: wallpaperSection.implicitHeight + Theme.spacingL * 2 height: wallpaperSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: wallpaperSection id: wallpaperSection
@@ -137,7 +137,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceVariant color: Theme.surfaceVariant
border.color: Theme.outline border.color: Theme.outline
border.width: 1 border.width: 0
CachingImage { CachingImage {
anchors.fill: parent anchors.fill: parent
@@ -377,7 +377,7 @@ Item {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath
return (currentWallpaper && !currentWallpaper.startsWith("#") && !currentWallpaper.startsWith("we")) ? 1 : 0.5 return (currentWallpaper && !currentWallpaper.startsWith("#") && !currentWallpaper.startsWith("we")) ? 1 : 0.5
} }
backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5) backgroundColor: Theme.surfaceContainerHigh
iconColor: Theme.surfaceText iconColor: Theme.surfaceText
onClicked: { onClicked: {
if (SessionData.perMonitorWallpaper) { if (SessionData.perMonitorWallpaper) {
@@ -400,7 +400,7 @@ Item {
var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath var currentWallpaper = SessionData.perMonitorWallpaper ? SessionData.getMonitorWallpaper(selectedMonitorName) : SessionData.wallpaperPath
return (currentWallpaper && !currentWallpaper.startsWith("#") && !currentWallpaper.startsWith("we")) ? 1 : 0.5 return (currentWallpaper && !currentWallpaper.startsWith("#") && !currentWallpaper.startsWith("we")) ? 1 : 0.5
} }
backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5) backgroundColor: Theme.surfaceContainerHigh
iconColor: Theme.surfaceText iconColor: Theme.surfaceText
onClicked: { onClicked: {
if (SessionData.perMonitorWallpaper) { if (SessionData.perMonitorWallpaper) {
@@ -867,9 +867,9 @@ Item {
width: parent.width width: parent.width
height: dynamicThemeSection.implicitHeight + Theme.spacingL * 2 height: dynamicThemeSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: dynamicThemeSection id: dynamicThemeSection
@@ -972,9 +972,9 @@ Item {
width: parent.width width: parent.width
height: displaySection.implicitHeight + Theme.spacingL * 2 height: displaySection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: displaySection id: displaySection
@@ -1359,9 +1359,9 @@ Item {
width: parent.width width: parent.width
height: lockScreenSection.implicitHeight + Theme.spacingL * 2 height: lockScreenSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: lockScreenSection id: lockScreenSection
@@ -1407,9 +1407,9 @@ Item {
width: parent.width width: parent.width
height: fontSection.implicitHeight + Theme.spacingL * 2 height: fontSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: fontSection id: fontSection
@@ -1593,7 +1593,7 @@ Item {
iconName: "remove" iconName: "remove"
iconSize: Theme.iconSizeSmall iconSize: Theme.iconSizeSmall
enabled: SettingsData.fontScale > 1.0 enabled: SettingsData.fontScale > 1.0
backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5) backgroundColor: Theme.surfaceContainerHigh
iconColor: Theme.surfaceText iconColor: Theme.surfaceText
onClicked: { onClicked: {
var newScale = Math.max(1.0, SettingsData.fontScale - 0.05) var newScale = Math.max(1.0, SettingsData.fontScale - 0.05)
@@ -1605,9 +1605,9 @@ Item {
width: 60 width: 60
height: 32 height: 32
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
border.width: 1 border.width: 0
StyledText { StyledText {
anchors.centerIn: parent anchors.centerIn: parent
@@ -1623,7 +1623,7 @@ Item {
iconName: "add" iconName: "add"
iconSize: Theme.iconSizeSmall iconSize: Theme.iconSizeSmall
enabled: SettingsData.fontScale < 2.0 enabled: SettingsData.fontScale < 2.0
backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.5) backgroundColor: Theme.surfaceContainerHigh
iconColor: Theme.surfaceText iconColor: Theme.surfaceText
onClicked: { onClicked: {
var newScale = Math.min(2.0, SettingsData.fontScale + 0.05) var newScale = Math.min(2.0, SettingsData.fontScale + 0.05)

76
Modules/Settings/ThemeColorsTab.qml
View File

@@ -106,11 +106,10 @@ Item {
width: parent.width width: parent.width
height: themeSection.implicitHeight + Theme.spacingL * 2 height: themeSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: themeSection id: themeSection
@@ -137,6 +136,40 @@ Item {
color: Theme.surfaceText color: Theme.surfaceText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
Item {
width: parent.width - parent.children[0].width - parent.children[1].width - surfaceBaseGroup.width - Theme.spacingM * 3
height: 1
}
DankButtonGroup {
id: surfaceBaseGroup
property int currentSurfaceIndex: {
switch (SettingsData.surfaceBase) {
case "sc": return 0
case "s": return 1
default: return 0
}
}
model: ["Container", "Surface"]
currentIndex: currentSurfaceIndex
selectionMode: "single"
anchors.verticalCenter: parent.verticalCenter
buttonHeight: 20
minButtonWidth: 48
buttonPadding: Theme.spacingS
checkIconSize: Theme.iconSizeSmall - 2
textSize: Theme.fontSizeSmall - 2
spacing: 1
onSelectionChanged: (index, selected) => {
if (!selected) return
const surfaceOptions = ["sc", "s"]
SettingsData.setSurfaceBase(surfaceOptions[index])
}
}
} }
Column { Column {
@@ -181,6 +214,7 @@ Item {
} }
} }
Column { Column {
spacing: Theme.spacingM spacing: Theme.spacingM
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
@@ -246,7 +280,7 @@ Item {
height: nameText.contentHeight + Theme.spacingXS * 2 height: nameText.contentHeight + Theme.spacingXS * 2
color: Theme.surfaceContainer color: Theme.surfaceContainer
border.color: Theme.outline border.color: Theme.outline
border.width: 1 border.width: 0
radius: Theme.cornerRadius radius: Theme.cornerRadius
anchors.bottom: parent.top anchors.bottom: parent.top
anchors.bottomMargin: Theme.spacingXS anchors.bottomMargin: Theme.spacingXS
@@ -311,7 +345,7 @@ Item {
height: nameText2.contentHeight + Theme.spacingXS * 2 height: nameText2.contentHeight + Theme.spacingXS * 2
color: Theme.surfaceContainer color: Theme.surfaceContainer
border.color: Theme.outline border.color: Theme.outline
border.width: 1 border.width: 0
radius: Theme.cornerRadius radius: Theme.cornerRadius
anchors.bottom: parent.top anchors.bottom: parent.top
anchors.bottomMargin: Theme.spacingXS anchors.bottomMargin: Theme.spacingXS
@@ -382,7 +416,7 @@ Item {
height: nameTextCat.contentHeight + Theme.spacingXS * 2 height: nameTextCat.contentHeight + Theme.spacingXS * 2
color: Theme.surfaceContainer color: Theme.surfaceContainer
border.color: Theme.outline border.color: Theme.outline
border.width: 1 border.width: 0
radius: Theme.cornerRadius radius: Theme.cornerRadius
anchors.bottom: parent.top anchors.bottom: parent.top
anchors.bottomMargin: Theme.spacingXS anchors.bottomMargin: Theme.spacingXS
@@ -447,7 +481,7 @@ Item {
height: nameTextCat2.contentHeight + Theme.spacingXS * 2 height: nameTextCat2.contentHeight + Theme.spacingXS * 2
color: Theme.surfaceContainer color: Theme.surfaceContainer
border.color: Theme.outline border.color: Theme.outline
border.width: 1 border.width: 0
radius: Theme.cornerRadius radius: Theme.cornerRadius
anchors.bottom: parent.top anchors.bottom: parent.top
anchors.bottomMargin: Theme.spacingXS anchors.bottomMargin: Theme.spacingXS
@@ -506,7 +540,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceVariant color: Theme.surfaceVariant
border.color: Theme.outline border.color: Theme.outline
border.width: 1 border.width: 0
CachingImage { CachingImage {
anchors.fill: parent anchors.fill: parent
@@ -693,11 +727,10 @@ Item {
width: parent.width width: parent.width
height: transparencySection.implicitHeight + Theme.spacingL * 2 height: transparencySection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: transparencySection id: transparencySection
@@ -747,6 +780,7 @@ Item {
unit: "" unit: ""
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setTopBarTransparency( SettingsData.setTopBarTransparency(
newValue / 100) newValue / 100)
@@ -815,6 +849,7 @@ Item {
unit: "" unit: ""
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setTopBarWidgetTransparency( SettingsData.setTopBarWidgetTransparency(
newValue / 100) newValue / 100)
@@ -843,6 +878,7 @@ Item {
unit: "" unit: ""
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setPopupTransparency( SettingsData.setPopupTransparency(
newValue / 100) newValue / 100)
@@ -850,6 +886,7 @@ Item {
} }
} }
Rectangle { Rectangle {
width: parent.width width: parent.width
height: 1 height: 1
@@ -877,6 +914,7 @@ Item {
unit: "" unit: ""
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setCornerRadius( SettingsData.setCornerRadius(
newValue) newValue)
@@ -895,7 +933,7 @@ Item {
Theme.warning.b, 0.12) Theme.warning.b, 0.12)
border.color: Qt.rgba(Theme.warning.r, Theme.warning.g, border.color: Qt.rgba(Theme.warning.r, Theme.warning.g,
Theme.warning.b, 0.3) Theme.warning.b, 0.3)
border.width: 1 border.width: 0
Row { Row {
anchors.fill: parent anchors.fill: parent
@@ -925,11 +963,10 @@ Item {
width: parent.width width: parent.width
height: iconThemeSection.implicitHeight + Theme.spacingL * 2 height: iconThemeSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: iconThemeSection id: iconThemeSection
@@ -980,11 +1017,10 @@ Item {
width: parent.width width: parent.width
height: systemThemingSection.implicitHeight + Theme.spacingL * 2 height: systemThemingSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
visible: Theme.matugenAvailable visible: Theme.matugenAvailable
Column { Column {
@@ -1024,7 +1060,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
border.color: Theme.primary border.color: Theme.primary
border.width: 1 border.width: 0
Row { Row {
anchors.centerIn: parent anchors.centerIn: parent
@@ -1060,7 +1096,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12) color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.12)
border.color: Theme.primary border.color: Theme.primary
border.width: 1 border.width: 0
Row { Row {
anchors.centerIn: parent anchors.centerIn: parent

16
Modules/Settings/TimeTab.qml
View File

@@ -24,11 +24,10 @@ Item {
width: parent.width width: parent.width
height: timeSection.implicitHeight + Theme.spacingL * 2 height: timeSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: timeSection id: timeSection
@@ -89,11 +88,10 @@ Item {
width: parent.width width: parent.width
height: dateSection.implicitHeight + Theme.spacingL * 2 height: dateSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: dateSection id: dateSection
@@ -280,12 +278,10 @@ Item {
width: parent.width width: parent.width
height: formatHelp.implicitHeight + Theme.spacingM * 2 height: formatHelp.implicitHeight + Theme.spacingM * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.g,
Theme.surfaceVariant.b, 0.2)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.1) Theme.outline.b, 0.1)
border.width: 1 border.width: 0
Column { Column {
id: formatHelp id: formatHelp

41
Modules/Settings/TopBarTab.qml
View File

@@ -589,11 +589,10 @@ Item {
width: parent.width width: parent.width
height: topBarAutoHideSection.implicitHeight + Theme.spacingL * 2 height: topBarAutoHideSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: topBarAutoHideSection id: topBarAutoHideSection
@@ -761,11 +760,10 @@ Item {
width: parent.width width: parent.width
height: topBarSpacingSection.implicitHeight + Theme.spacingL * 2 height: topBarSpacingSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: topBarSpacingSection id: topBarSpacingSection
@@ -814,7 +812,7 @@ Item {
unit: "" unit: ""
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainer thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setTopBarSpacing( SettingsData.setTopBarSpacing(
newValue) newValue)
@@ -842,7 +840,7 @@ Item {
unit: "" unit: ""
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainer thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setTopBarBottomGap( SettingsData.setTopBarBottomGap(
newValue) newValue)
@@ -870,7 +868,7 @@ Item {
unit: "" unit: ""
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainer thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setTopBarInnerPadding( SettingsData.setTopBarInnerPadding(
newValue) newValue)
@@ -919,11 +917,10 @@ Item {
width: parent.width width: parent.width
height: widgetManagementSection.implicitHeight + Theme.spacingL * 2 height: widgetManagementSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: widgetManagementSection id: widgetManagementSection
@@ -965,7 +962,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: resetArea.containsMouse ? Theme.surfacePressed : Theme.surfaceVariant color: resetArea.containsMouse ? Theme.surfacePressed : Theme.surfaceVariant
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
border.width: 1 border.width: 0
border.color: resetArea.containsMouse ? Theme.outline : Qt.rgba( border.color: resetArea.containsMouse ? Theme.outline : Qt.rgba(
Theme.outline.r, Theme.outline.r,
Theme.outline.g, Theme.outline.g,
@@ -1043,12 +1040,10 @@ Item {
width: parent.width width: parent.width
height: leftSection.implicitHeight + Theme.spacingL * 2 height: leftSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.g,
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
WidgetsTabSection { WidgetsTabSection {
id: leftSection id: leftSection
@@ -1117,12 +1112,10 @@ Item {
width: parent.width width: parent.width
height: centerSection.implicitHeight + Theme.spacingL * 2 height: centerSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.g,
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
WidgetsTabSection { WidgetsTabSection {
id: centerSection id: centerSection
@@ -1191,12 +1184,10 @@ Item {
width: parent.width width: parent.width
height: rightSection.implicitHeight + Theme.spacingL * 2 height: rightSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.g,
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
WidgetsTabSection { WidgetsTabSection {
id: rightSection id: rightSection

15
Modules/Settings/WeatherTab.qml
View File

@@ -24,11 +24,10 @@ Item {
width: parent.width width: parent.width
height: enableWeatherSection.implicitHeight + Theme.spacingL * 2 height: enableWeatherSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: enableWeatherSection id: enableWeatherSection
@@ -89,11 +88,10 @@ Item {
width: parent.width width: parent.width
height: temperatureSection.implicitHeight + Theme.spacingL * 2 height: temperatureSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
visible: SettingsData.weatherEnabled visible: SettingsData.weatherEnabled
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0
@@ -163,11 +161,10 @@ Item {
width: parent.width width: parent.width
height: locationSection.implicitHeight + Theme.spacingL * 2 height: locationSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
visible: SettingsData.weatherEnabled visible: SettingsData.weatherEnabled
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0

4
Modules/Settings/WidgetSelectionPopup.qml
View File

@@ -103,7 +103,7 @@ Popup {
color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g, color: Qt.rgba(Theme.surfaceContainer.r, Theme.surfaceContainer.g,
Theme.surfaceContainer.b, 1) Theme.surfaceContainer.b, 1)
border.color: Theme.primarySelected border.color: Theme.primarySelected
border.width: 1 border.width: 0
radius: Theme.cornerRadius radius: Theme.cornerRadius
} }
@@ -192,7 +192,7 @@ Popup {
width: parent.width width: parent.width
height: 48 height: 48
cornerRadius: Theme.cornerRadius cornerRadius: Theme.cornerRadius
backgroundColor: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, Theme.surfaceVariant.b, 0.3) backgroundColor: Theme.surfaceContainerHigh
normalBorderColor: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) normalBorderColor: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2)
focusedBorderColor: Theme.primary focusedBorderColor: Theme.primary
leftIconName: "search" leftIconName: "search"

31
Modules/Settings/WidgetTweaksTab.qml
View File

@@ -24,11 +24,10 @@ Item {
width: parent.width width: parent.width
height: launcherButtonSection.implicitHeight + Theme.spacingL * 2 height: launcherButtonSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: launcherButtonSection id: launcherButtonSection
@@ -128,6 +127,7 @@ Item {
unit: "%" unit: "%"
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setOSLogoBrightness( SettingsData.setOSLogoBrightness(
newValue / 100) newValue / 100)
@@ -156,6 +156,7 @@ Item {
unit: "%" unit: "%"
showValue: true showValue: true
wheelEnabled: false wheelEnabled: false
thumbOutlineColor: Theme.surfaceContainerHigh
onSliderValueChanged: newValue => { onSliderValueChanged: newValue => {
SettingsData.setOSLogoContrast( SettingsData.setOSLogoContrast(
newValue / 100) newValue / 100)
@@ -177,11 +178,10 @@ Item {
width: parent.width width: parent.width
height: workspaceSection.implicitHeight + Theme.spacingL * 2 height: workspaceSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: workspaceSection id: workspaceSection
@@ -301,11 +301,10 @@ Item {
width: parent.width width: parent.width
height: mediaSection.implicitHeight + Theme.spacingL * 2 height: mediaSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: mediaSection id: mediaSection
@@ -350,11 +349,10 @@ Item {
width: parent.width width: parent.width
height: runningAppsSection.implicitHeight + Theme.spacingL * 2 height: runningAppsSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
Column { Column {
id: runningAppsSection id: runningAppsSection
@@ -400,11 +398,10 @@ Item {
width: parent.width width: parent.width
height: workspaceIconsSection.implicitHeight + Theme.spacingL * 2 height: workspaceIconsSection.implicitHeight + Theme.spacingL * 2
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.surfaceVariant.r, Theme.surfaceVariant.g, color: Theme.surfaceContainerHigh
Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
visible: SettingsData.hasNamedWorkspaces() visible: SettingsData.hasNamedWorkspaces()
Column { Column {
@@ -455,7 +452,7 @@ Item {
border.color: Qt.rgba(Theme.outline.r, border.color: Qt.rgba(Theme.outline.r,
Theme.outline.g, Theme.outline.g,
Theme.outline.b, 0.3) Theme.outline.b, 0.3)
border.width: 1 border.width: 0
Row { Row {
id: workspaceIconRow id: workspaceIconRow
@@ -522,7 +519,7 @@ Item {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: clearMouseArea.containsMouse ? Theme.errorHover : Theme.surfaceContainer color: clearMouseArea.containsMouse ? Theme.errorHover : Theme.surfaceContainer
border.color: clearMouseArea.containsMouse ? Theme.error : Theme.outline border.color: clearMouseArea.containsMouse ? Theme.error : Theme.outline
border.width: 1 border.width: 0
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
DankIcon { DankIcon {

10
Modules/Settings/WidgetsTabSection.qml
View File

@@ -82,7 +82,7 @@ Column {
Theme.surfaceContainer.b, 0.8) Theme.surfaceContainer.b, 0.8)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
DankIcon { DankIcon {
name: "drag_indicator" name: "drag_indicator"
@@ -259,7 +259,7 @@ Column {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceContainer color: Theme.surfaceContainer
border.color: Theme.outline border.color: Theme.outline
border.width: 1 border.width: 0
visible: warningArea.containsMouse visible: warningArea.containsMouse
&& warningText !== "" && warningText !== ""
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0
@@ -382,7 +382,7 @@ Column {
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceContainer color: Theme.surfaceContainer
border.color: Theme.outline border.color: Theme.outline
border.width: 1 border.width: 0
visible: false visible: false
opacity: visible ? 1 : 0 opacity: visible ? 1 : 0
x: -width - Theme.spacingS x: -width - Theme.spacingS
@@ -560,7 +560,7 @@ Column {
Theme.surfaceVariant.b, 0.3) Theme.surfaceVariant.b, 0.3)
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, border.color: Qt.rgba(Theme.outline.r, Theme.outline.g,
Theme.outline.b, 0.2) Theme.outline.b, 0.2)
border.width: 1 border.width: 0
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
StyledText { StyledText {
@@ -618,7 +618,7 @@ Column {
color: Theme.popupBackground() color: Theme.popupBackground()
radius: Theme.cornerRadius radius: Theme.cornerRadius
border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
border.width: 1 border.width: 0
} }
contentItem: Item { contentItem: Item {

10
Modules/TopBar/BatteryPopout.qml
View File

@@ -304,9 +304,8 @@ DankPopout {
width: (parent.width - Theme.spacingM) / 2 width: (parent.width - Theme.spacingM) / 2
height: 64 height: 64
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.2) border.width: 0
border.width: 1
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent
@@ -340,9 +339,8 @@ DankPopout {
width: (parent.width - Theme.spacingM) / 2 width: (parent.width - Theme.spacingM) / 2
height: 64 height: 64
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.08) color: Theme.surfaceContainerHigh
border.color: Qt.rgba(Theme.primary.r, Theme.primary.g, Theme.primary.b, 0.2) border.width: 0
border.width: 1
Column { Column {
anchors.centerIn: parent anchors.centerIn: parent

2
Widgets/DankToggle.qml
View File

@@ -36,7 +36,7 @@ Item {
id: background id: background
anchors.fill: parent anchors.fill: parent
radius: showText ? Theme.cornerRadius : 0 radius: showText ? Theme.cornerRadius : 0
color: showText ? Theme.surfaceHover : "transparent" color: "transparent"
visible: showText visible: showText
StateLayer { StateLayer {

3
docs/CUSTOM_THEMES.md
View File

@@ -28,6 +28,7 @@ These are the essential colors that define your theme's appearance:
"outline": "#80FF80", "outline": "#80FF80",
"surfaceContainer": "#1A2B1A", "surfaceContainer": "#1A2B1A",
"surfaceContainerHigh": "#264026", "surfaceContainerHigh": "#264026",
"surfaceContainerHighest": "#33553F",
"error": "#FF0066", "error": "#FF0066",
"warning": "#CCFF00", "warning": "#CCFF00",
"info": "#00FFCC", "info": "#00FFCC",
@@ -49,6 +50,7 @@ These are the essential colors that define your theme's appearance:
"outline": "#4DCC4D", "outline": "#4DCC4D",
"surfaceContainer": "#F5FFF5", "surfaceContainer": "#F5FFF5",
"surfaceContainerHigh": "#EBFFEB", "surfaceContainerHigh": "#EBFFEB",
"surfaceContainerHighest": "#E1FFE1",
"error": "#B3004D", "error": "#B3004D",
"warning": "#99CC00", "warning": "#99CC00",
"info": "#00B899", "info": "#00B899",
@@ -96,6 +98,7 @@ There are example themes you can start from:
- `surfaceVariantText` - Text color for surfaceVariant backgrounds - `surfaceVariantText` - Text color for surfaceVariant backgrounds
- `surfaceContainer` - Container surface color, slightly different from surface - `surfaceContainer` - Container surface color, slightly different from surface
- `surfaceContainerHigh` - Elevated container color for layered interfaces - `surfaceContainerHigh` - Elevated container color for layered interfaces
- `surfaceContainerHighest` - Highest elevation container color for top-level surfaces
**Background Colors** **Background Colors**
- `background` - Main background color for the entire interface - `background` - Main background color for the entire interface

48
scripts/matugen-worker.sh
View File

@@ -47,21 +47,25 @@ key_of() {
local mode=$(echo "$json" | sed 's/.*"mode": *"\([^"]*\)".*/\1/') local mode=$(echo "$json" | sed 's/.*"mode": *"\([^"]*\)".*/\1/')
local icon=$(echo "$json" | sed 's/.*"iconTheme": *"\([^"]*\)".*/\1/') local icon=$(echo "$json" | sed 's/.*"iconTheme": *"\([^"]*\)".*/\1/')
local matugen_type=$(echo "$json" | sed 's/.*"matugenType": *"\([^"]*\)".*/\1/') local matugen_type=$(echo "$json" | sed 's/.*"matugenType": *"\([^"]*\)".*/\1/')
local surface_base=$(echo "$json" | sed 's/.*"surfaceBase": *"\([^"]*\)".*/\1/')
[[ -z "$icon" ]] && icon="System Default" [[ -z "$icon" ]] && icon="System Default"
[[ -z "$matugen_type" ]] && matugen_type="scheme-tonal-spot" [[ -z "$matugen_type" ]] && matugen_type="scheme-tonal-spot"
echo "${kind}|${value}|${mode}|${icon}|${matugen_type}" | sha256sum | cut -d' ' -f1 [[ -z "$surface_base" ]] && surface_base="sc"
echo "${kind}|${value}|${mode}|${icon}|${matugen_type}|${surface_base}" | sha256sum | cut -d' ' -f1
} }
build_once() { build_once() {
local json="$1" local json="$1"
local kind value mode icon matugen_type local kind value mode icon matugen_type surface_base
kind=$(echo "$json" | sed 's/.*"kind": *"\([^"]*\)".*/\1/') kind=$(echo "$json" | sed 's/.*"kind": *"\([^"]*\)".*/\1/')
value=$(echo "$json" | sed 's/.*"value": *"\([^"]*\)".*/\1/') value=$(echo "$json" | sed 's/.*"value": *"\([^"]*\)".*/\1/')
mode=$(echo "$json" | sed 's/.*"mode": *"\([^"]*\)".*/\1/') mode=$(echo "$json" | sed 's/.*"mode": *"\([^"]*\)".*/\1/')
icon=$(echo "$json" | sed 's/.*"iconTheme": *"\([^"]*\)".*/\1/') icon=$(echo "$json" | sed 's/.*"iconTheme": *"\([^"]*\)".*/\1/')
matugen_type=$(echo "$json" | sed 's/.*"matugenType": *"\([^"]*\)".*/\1/') matugen_type=$(echo "$json" | sed 's/.*"matugenType": *"\([^"]*\)".*/\1/')
surface_base=$(echo "$json" | sed 's/.*"surfaceBase": *"\([^"]*\)".*/\1/')
[[ -z "$icon" ]] && icon="System Default" [[ -z "$icon" ]] && icon="System Default"
[[ -z "$matugen_type" ]] && matugen_type="scheme-tonal-spot" [[ -z "$matugen_type" ]] && matugen_type="scheme-tonal-spot"
[[ -z "$surface_base" ]] && surface_base="sc"
CONFIG_DIR="${CONFIG_DIR:-$HOME/.config}" CONFIG_DIR="${CONFIG_DIR:-$HOME/.config}"
@@ -106,6 +110,34 @@ build_once() {
sed -i "/\[templates\.gtk3\]/,/^$/ s|input_path = './matugen/templates/gtk-colors.css'|input_path = '$COLLOID_TEMPLATE'|" "$TMP_CFG" sed -i "/\[templates\.gtk3\]/,/^$/ s|input_path = './matugen/templates/gtk-colors.css'|input_path = '$COLLOID_TEMPLATE'|" "$TMP_CFG"
sed -i "s|input_path = './matugen/templates/|input_path = '$SHELL_DIR/matugen/templates/|g" "$TMP_CFG" sed -i "s|input_path = './matugen/templates/|input_path = '$SHELL_DIR/matugen/templates/|g" "$TMP_CFG"
# Handle surface shifting if needed
if [[ "$surface_base" == "s" ]]; then
TMP_TEMPLATES_DIR="$(mktemp -d)"
trap 'rm -rf "$TMP_TEMPLATES_DIR"' RETURN
# Create shifted versions of templates
for template in "$SHELL_DIR/matugen/templates"/*.{css,conf,json,kdl,colors}; do
[[ -f "$template" ]] || continue
template_name="$(basename "$template")"
shifted_template="$TMP_TEMPLATES_DIR/$template_name"
# Apply surface shifting transformations
sed -e 's/{{colors\.surface\.default\.hex}}/{{colors.background.default.hex}}/g' \
-e 's/{{colors\.surface_container\.default\.hex}}/{{colors.surface.default.hex}}/g' \
-e 's/{{colors\.surface_container_high\.default\.hex}}/{{colors.surface_container.default.hex}}/g' \
-e 's/{{colors\.surface_container_highest\.default\.hex}}/{{colors.surface_container_high.default.hex}}/g' \
"$template" > "$shifted_template"
done
# Update config to use shifted templates
sed -i "s|input_path = '$SHELL_DIR/matugen/templates/|input_path = '$TMP_TEMPLATES_DIR/|g" "$TMP_CFG"
# Handle the special colloid template path
if [[ -f "$TMP_TEMPLATES_DIR/gtk3-colors.css" ]]; then
sed -i "/\[templates\.gtk3\]/,/^$/ s|input_path = '$COLLOID_TEMPLATE'|input_path = '$TMP_TEMPLATES_DIR/gtk3-colors.css'|" "$TMP_CFG"
fi
fi
pushd "$SHELL_DIR" >/dev/null pushd "$SHELL_DIR" >/dev/null
MAT_MODE=(-m "$mode") MAT_MODE=(-m "$mode")
MAT_TYPE=(-t "$matugen_type") MAT_TYPE=(-t "$matugen_type")
@@ -129,21 +161,27 @@ build_once() {
echo "[config]" > "$TMP_CONTENT_CFG" echo "[config]" > "$TMP_CONTENT_CFG"
echo "" >> "$TMP_CONTENT_CFG" echo "" >> "$TMP_CONTENT_CFG"
# Use shifted templates for content config if surface_base is "s"
CONTENT_TEMPLATES_PATH="$SHELL_DIR/matugen/templates/"
if [[ "$surface_base" == "s" && -n "${TMP_TEMPLATES_DIR:-}" ]]; then
CONTENT_TEMPLATES_PATH="$TMP_TEMPLATES_DIR/"
fi
if command -v ghostty >/dev/null 2>&1; then if command -v ghostty >/dev/null 2>&1; then
cat "$SHELL_DIR/matugen/configs/ghostty.toml" >> "$TMP_CONTENT_CFG" cat "$SHELL_DIR/matugen/configs/ghostty.toml" >> "$TMP_CONTENT_CFG"
sed -i "s|input_path = './matugen/templates/|input_path = '$SHELL_DIR/matugen/templates/|g" "$TMP_CONTENT_CFG" sed -i "s|input_path = './matugen/templates/|input_path = '$CONTENT_TEMPLATES_PATH'|g" "$TMP_CONTENT_CFG"
echo "" >> "$TMP_CONTENT_CFG" echo "" >> "$TMP_CONTENT_CFG"
fi fi
if command -v kitty >/dev/null 2>&1; then if command -v kitty >/dev/null 2>&1; then
cat "$SHELL_DIR/matugen/configs/kitty.toml" >> "$TMP_CONTENT_CFG" cat "$SHELL_DIR/matugen/configs/kitty.toml" >> "$TMP_CONTENT_CFG"
sed -i "s|input_path = './matugen/templates/|input_path = '$SHELL_DIR/matugen/templates/|g" "$TMP_CONTENT_CFG" sed -i "s|input_path = './matugen/templates/|input_path = '$CONTENT_TEMPLATES_PATH'|g" "$TMP_CONTENT_CFG"
echo "" >> "$TMP_CONTENT_CFG" echo "" >> "$TMP_CONTENT_CFG"
fi fi
if command -v dgop >/dev/null 2>&1; then if command -v dgop >/dev/null 2>&1; then
cat "$SHELL_DIR/matugen/configs/dgop.toml" >> "$TMP_CONTENT_CFG" cat "$SHELL_DIR/matugen/configs/dgop.toml" >> "$TMP_CONTENT_CFG"
sed -i "s|input_path = './matugen/templates/|input_path = '$SHELL_DIR/matugen/templates/|g" "$TMP_CONTENT_CFG" sed -i "s|input_path = './matugen/templates/|input_path = '$CONTENT_TEMPLATES_PATH'|g" "$TMP_CONTENT_CFG"
echo "" >> "$TMP_CONTENT_CFG" echo "" >> "$TMP_CONTENT_CFG"
fi fi