Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-04 12:38:31 -04:00
Code Packages Releases Activity

theme: large consolidation of colors into Theme.qml, add

Browse Source 
surfaceContainerLow/Lowest
This commit is contained in:
bbedward
2026-06-29 15:50:42 -04:00
parent 50570023ff
commit 894efa58a3
182 changed files with 886 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickshell/Common/StockThemes.js
+40
View File
@@ -17,6 +17,8 @@ const StockThemes = {
background: "#101418",
backgroundText: "#e0e2e8",
outline: "#8c9199",
surfaceContainerLowest: "#0c1014",
surfaceContainerLow: "#191c20",
surfaceContainer: "#1d2024",
surfaceContainerHigh: "#272a2f",
surfaceContainerHighest: "#32353a",
@@ -35,6 +37,8 @@ const StockThemes = {
background: "#141218",
backgroundText: "#e6e0e9",
outline: "#948f99",
surfaceContainerLowest: "#100e14",
surfaceContainerLow: "#1d1b20",
surfaceContainer: "#211f24",
surfaceContainerHigh: "#2b292f",
surfaceContainerHighest: "#36343a",
@@ -53,6 +57,8 @@ const StockThemes = {
background: "#10140f",
backgroundText: "#e0e4db",
outline: "#8c9388",
surfaceContainerLowest: "#0c100b",
surfaceContainerLow: "#191d17",
surfaceContainer: "#1d211b",
surfaceContainerHigh: "#272b25",
surfaceContainerHighest: "#323630",
@@ -71,6 +77,8 @@ const StockThemes = {
background: "#1a120e",
backgroundText: "#f0dfd8",
outline: "#a08d85",
surfaceContainerLowest: "#160e0a",
surfaceContainerLow: "#231a16",
surfaceContainer: "#271e1a",
surfaceContainerHigh: "#322824",
surfaceContainerHighest: "#3d332e",
@@ -89,6 +97,8 @@ const StockThemes = {
background: "#1a1110",
backgroundText: "#f1dedc",
outline: "#a08c89",
surfaceContainerLowest: "#160d0c",
surfaceContainerLow: "#231918",
surfaceContainer: "#271d1c",
surfaceContainerHigh: "#322826",
surfaceContainerHighest: "#3d3231",
@@ -107,6 +117,8 @@ const StockThemes = {
background: "#0e1416",
backgroundText: "#dee3e5",
outline: "#899295",
surfaceContainerLowest: "#0a1012",
surfaceContainerLow: "#171d1e",
surfaceContainer: "#1b2122",
surfaceContainerHigh: "#252b2c",
surfaceContainerHighest: "#303637",
@@ -125,6 +137,8 @@ const StockThemes = {
background: "#191112",
backgroundText: "#f0dee0",
outline: "#9f8c8e",
surfaceContainerLowest: "#150d0e",
surfaceContainerLow: "#22191a",
surfaceContainer: "#261d1e",
surfaceContainerHigh: "#312829",
surfaceContainerHighest: "#3c3233",
@@ -143,6 +157,8 @@ const StockThemes = {
background: "#17130b",
backgroundText: "#ebe1d4",
outline: "#998f80",
surfaceContainerLowest: "#130f07",
surfaceContainerLow: "#1f1b13",
surfaceContainer: "#231f17",
surfaceContainerHigh: "#2e2921",
surfaceContainerHighest: "#39342b",
@@ -161,6 +177,8 @@ const StockThemes = {
background: "#1a1110",
backgroundText: "#f1dedc",
outline: "#a08c8a",
surfaceContainerLowest: "#160d0c",
surfaceContainerLow: "#231918",
surfaceContainer: "#271d1c",
surfaceContainerHigh: "#322826",
surfaceContainerHighest: "#3d3231",
@@ -179,6 +197,8 @@ const StockThemes = {
background: "#131315",
backgroundText: "#e4e2e3",
outline: "#929092",
surfaceContainerLowest: "#252525",
surfaceContainerLow: "#303030",
surfaceContainer: "#353535",
surfaceContainerHigh: "#424242",
surfaceContainerHighest: "#505050",
@@ -203,6 +223,8 @@ const StockThemes = {
background: "#f7f9ff",
backgroundText: "#181c20",
outline: "#72777f",
surfaceContainerLowest: "#f9fbff",
surfaceContainerLow: "#eef0f6",
surfaceContainer: "#eceef4",
surfaceContainerHigh: "#e6e8ee",
surfaceContainerHighest: "#e0e2e8",
@@ -221,6 +243,8 @@ const StockThemes = {
background: "#fef7ff",
backgroundText: "#1d1b20",
outline: "#7a757f",
surfaceContainerLowest: "#fff9ff",
surfaceContainerLow: "#f4eef6",
surfaceContainer: "#f2ecf4",
surfaceContainerHigh: "#ece6ee",
surfaceContainerHighest: "#e6e0e9",
@@ -239,6 +263,8 @@ const StockThemes = {
background: "#f7fbf1",
backgroundText: "#191d17",
outline: "#72796f",
surfaceContainerLowest: "#f9fdf3",
surfaceContainerLow: "#eef1e8",
surfaceContainer: "#ecefe6",
surfaceContainerHigh: "#e6e9e0",
surfaceContainerHighest: "#e0e4db",
@@ -257,6 +283,8 @@ const StockThemes = {
background: "#fff8f6",
backgroundText: "#221a16",
outline: "#85736c",
surfaceContainerLowest: "#fffaf8",
surfaceContainerLow: "#feece5",
surfaceContainer: "#fceae3",
surfaceContainerHigh: "#f6e5de",
surfaceContainerHighest: "#f0dfd8",
@@ -275,6 +303,8 @@ const StockThemes = {
background: "#fff8f7",
backgroundText: "#231918",
outline: "#857370",
surfaceContainerLowest: "#fffaf9",
surfaceContainerLow: "#feece9",
surfaceContainer: "#fceae7",
surfaceContainerHigh: "#f7e4e1",
surfaceContainerHighest: "#f1dedc",
@@ -293,6 +323,8 @@ const StockThemes = {
background: "#f5fafc",
backgroundText: "#171d1e",
outline: "#6f797b",
surfaceContainerLowest: "#f7fcfe",
surfaceContainerLow: "#ebf1f2",
surfaceContainer: "#e9eff0",
surfaceContainerHigh: "#e3e9eb",
surfaceContainerHighest: "#dee3e5",
@@ -311,6 +343,8 @@ const StockThemes = {
background: "#fff8f7",
backgroundText: "#22191a",
outline: "#847375",
surfaceContainerLowest: "#fffaf9",
surfaceContainerLow: "#fdeced",
surfaceContainer: "#fbeaeb",
surfaceContainerHigh: "#f5e4e5",
surfaceContainerHighest: "#f0dee0",
@@ -329,6 +363,8 @@ const StockThemes = {
background: "#fff8f2",
backgroundText: "#1f1b13",
outline: "#7f7667",
surfaceContainerLowest: "#fffaf4",
surfaceContainerLow: "#f8eee1",
surfaceContainer: "#f6ecdf",
surfaceContainerHigh: "#f1e7d9",
surfaceContainerHighest: "#ebe1d4",
@@ -347,6 +383,8 @@ const StockThemes = {
background: "#fff8f7",
backgroundText: "#231918",
outline: "#857371",
surfaceContainerLowest: "#fffaf9",
surfaceContainerLow: "#feece9",
surfaceContainer: "#fceae7",
surfaceContainerHigh: "#f6e4e2",
surfaceContainerHighest: "#f1dedc",
@@ -365,6 +403,8 @@ const StockThemes = {
background: "#ffffff",
backgroundText: "#1a1a1a",
outline: "#757577",
surfaceContainerLowest: "#fafafb",
surfaceContainerLow: "#ededef",
surfaceContainer: "#e8e8ea",
surfaceContainerHigh: "#dcdcde",
surfaceContainerHighest: "#d0d0d2",
quickshell/Common/Theme.qml
+56 -40
View File
@@ -463,6 +463,8 @@ Singleton {
"background": getMatugenColor("background", "#1a1c1e"),
"backgroundText": getMatugenColor("on_background", "#e3e8ef"),
"outline": getMatugenColor("outline", "#8e918f"),
"surfaceContainerLowest": getMatugenColor("surface_container_lowest", "#0e1013"),
"surfaceContainerLow": getMatugenColor("surface_container_low", "#181a1d"),
"surfaceContainer": getMatugenColor("surface_container", "#1e2023"),
"surfaceContainerHigh": getMatugenColor("surface_container_high", "#292b2f"),
"surfaceContainerHighest": getMatugenColor("surface_container_highest", "#343740"),
@@ -535,7 +537,9 @@ Singleton {
property color background: currentThemeData.background
property color backgroundText: currentThemeData.backgroundText
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 || withAlpha(outline, 0.6)
property color surfaceContainerLowest: currentThemeData.surfaceContainerLowest || blend(surfaceContainer, surface, 1.2)
property color surfaceContainerLow: currentThemeData.surfaceContainerLow || blend(surface, surfaceContainer, 0.667)
property color surfaceContainer: currentThemeData.surfaceContainer
property color surfaceContainerHigh: currentThemeData.surfaceContainerHigh
property color surfaceContainerHighest: currentThemeData.surfaceContainerHighest || surfaceContainerHigh
@@ -546,9 +550,9 @@ Singleton {
property color onSurface: surfaceText
property color onSurfaceVariant: surfaceVariantText
property color onPrimary: primaryText
property color onSurface_12: Qt.rgba(onSurface.r, onSurface.g, onSurface.b, 0.12)
property color onSurface_38: Qt.rgba(onSurface.r, onSurface.g, onSurface.b, 0.38)
property color onSurfaceVariant_30: Qt.rgba(onSurfaceVariant.r, onSurfaceVariant.g, onSurfaceVariant.b, 0.30)
property color onSurface_12: withAlpha(onSurface, 0.12)
property color onSurface_38: withAlpha(onSurface, 0.38)
property color onSurfaceVariant_30: withAlpha(onSurfaceVariant, 0.30)
property color error: currentThemeData.error || "#F2B8B5"
property color warning: currentThemeData.warning || "#FF9800"
@@ -557,32 +561,32 @@ Singleton {
property color tempDanger: "#ff5555"
property color success: currentThemeData.success || "#4CAF50"
property color primaryHover: Qt.rgba(primary.r, primary.g, primary.b, 0.12)
property color primaryHoverLight: Qt.rgba(primary.r, primary.g, primary.b, transparentBlurLayers ? 0.12 : 0.08)
property color primaryPressed: Qt.rgba(primary.r, primary.g, primary.b, transparentBlurLayers ? 0.24 : 0.16)
property color primarySelected: Qt.rgba(primary.r, primary.g, primary.b, 0.3)
property color primaryBackground: Qt.rgba(primary.r, primary.g, primary.b, 0.04)
property color primaryHover: withAlpha(primary, 0.12)
property color primaryHoverLight: withAlpha(primary, transparentBlurLayers ? 0.12 : 0.08)
property color primaryPressed: withAlpha(primary, transparentBlurLayers ? 0.24 : 0.16)
property color primarySelected: withAlpha(primary, 0.3)
property color primaryBackground: withAlpha(primary, 0.04)
property color secondaryHover: Qt.rgba(secondary.r, secondary.g, secondary.b, 0.08)
property color secondaryHover: withAlpha(secondary, 0.08)
property color surfaceHover: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.08)
property color surfacePressed: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.12)
property color surfaceSelected: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.15)
property color surfaceLight: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, transparentBlurLayers ? 0.3 : 0.1)
property color surfaceVariantAlpha: Qt.rgba(surfaceVariant.r, surfaceVariant.g, surfaceVariant.b, 0.2)
property color surfaceHover: withAlpha(surfaceVariant, 0.08)
property color surfacePressed: withAlpha(surfaceVariant, 0.12)
property color surfaceSelected: withAlpha(surfaceVariant, 0.15)
property color surfaceLight: withAlpha(surfaceVariant, transparentBlurLayers ? 0.3 : 0.1)
property color surfaceVariantAlpha: withAlpha(surfaceVariant, 0.2)
readonly property bool blurForegroundLayers: BlurService.enabled && (typeof SettingsData === "undefined" || (SettingsData.blurForegroundLayers ?? true))
readonly property bool transparentBlurLayers: BlurService.enabled && !blurForegroundLayers
readonly property color readableSurface: withAlpha(surfaceContainer, popupTransparency)
readonly property color readableSurfaceHigh: withAlpha(surfaceContainerHigh, popupTransparency)
readonly property color floatingSurface: transparentBlurLayers ? "transparent" : readableSurface
readonly property color floatingSurfaceHigh: transparentBlurLayers ? "transparent" : readableSurfaceHigh
readonly property color floatingSurface: transparentBlurLayers ? withAlpha(readableSurface, 0) : readableSurface
readonly property color floatingSurfaceHigh: transparentBlurLayers ? withAlpha(readableSurfaceHigh, 0) : readableSurfaceHigh
readonly property color nestedSurface: floatingSurfaceHigh
readonly property real blurLayerOutlineOpacity: Math.max(0, Math.min(1, typeof SettingsData === "undefined" ? 0.12 : (SettingsData.blurLayerOutlineOpacity ?? 0.12)))
readonly property real layerOutlineOpacity: BlurService.enabled ? blurLayerOutlineOpacity : 0.08
readonly property int layerOutlineWidth: BlurService.enabled && layerOutlineOpacity > 0 ? 1 : 0
property color surfaceTextHover: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.08)
property color surfaceTextAlpha: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.3)
property color surfaceTextHover: withAlpha(surfaceText, 0.08)
property color surfaceTextAlpha: withAlpha(surfaceText, 0.3)
function roleColor(mode) {
switch (mode) {
@@ -607,6 +611,10 @@ Singleton {
return surfaceVariant;
case "s":
return surface;
case "scll":
return surfaceContainerLowest;
case "scl":
return surfaceContainerLow;
case "sc":
return surfaceContainer;
case "sch":
@@ -619,19 +627,23 @@ Singleton {
case "err":
return error;
default:
return "transparent";
return withAlpha(surface, 0);
}
}
property color surfaceTextLight: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.06)
property color surfaceTextMedium: Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.7)
property color surfaceTextLight: withAlpha(surfaceText, 0.06)
property color surfaceTextSecondary: withAlpha(surfaceText, 0.6)
property color surfaceTextMedium: withAlpha(surfaceText, 0.7)
property color outlineButton: Qt.rgba(outline.r, outline.g, outline.b, 0.5)
property color outlineLight: Qt.rgba(outline.r, outline.g, outline.b, BlurService.enabled ? Math.min(1, layerOutlineOpacity * 0.625) : 0.05)
property color outlineMedium: Qt.rgba(outline.r, outline.g, outline.b, layerOutlineOpacity)
property color outlineStrong: Qt.rgba(outline.r, outline.g, outline.b, BlurService.enabled ? Math.min(1, layerOutlineOpacity * 1.5) : 0.12)
property color outlineButton: withAlpha(outline, 0.5)
property color outlineLight: withAlpha(outline, BlurService.enabled ? Math.min(1, layerOutlineOpacity * 0.625) : 0.05)
property color outlineMedium: withAlpha(outline, layerOutlineOpacity)
property color outlineStrong: withAlpha(outline, BlurService.enabled ? Math.min(1, layerOutlineOpacity * 1.5) : 0.12)
property color outlineHeavy: withAlpha(outline, 0.2)
property color errorHover: Qt.rgba(error.r, error.g, error.b, 0.12)
property color errorPressed: Qt.rgba(error.r, error.g, error.b, 0.16)
property color errorHover: withAlpha(error, 0.12)
property color errorPressed: withAlpha(error, 0.16)
property color errorSelected: withAlpha(error, 0.3)
property color warningHover: withAlpha(warning, 0.12)
readonly property color ccTileActiveBg: {
switch (SettingsData.controlCenterTileColorMode) {
@@ -681,13 +693,13 @@ Singleton {
readonly property color ccTileRing: {
switch (SettingsData.controlCenterTileColorMode) {
case "primaryContainer":
return Qt.rgba(primary.r, primary.g, primary.b, 0.22);
return withAlpha(primary, 0.22);
case "secondary":
return Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.22);
return withAlpha(surfaceText, 0.22);
case "surfaceVariant":
return Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.22);
return withAlpha(surfaceText, 0.22);
default:
return Qt.rgba(primaryText.r, primaryText.g, primaryText.b, 0.22);
return withAlpha(primaryText, 0.22);
}
}
@@ -720,11 +732,11 @@ Singleton {
readonly property color buttonHover: {
switch (SettingsData.buttonColorMode) {
case "primaryContainer":
return Qt.rgba(primary.r, primary.g, primary.b, 0.12);
return withAlpha(primary, 0.12);
case "secondary":
return Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.12);
return withAlpha(surfaceText, 0.12);
case "surfaceVariant":
return Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.12);
return withAlpha(surfaceText, 0.12);
default:
return primaryHover;
}
@@ -733,11 +745,11 @@ Singleton {
readonly property color buttonPressed: {
switch (SettingsData.buttonColorMode) {
case "primaryContainer":
return Qt.rgba(primary.r, primary.g, primary.b, 0.16);
return withAlpha(primary, 0.16);
case "secondary":
return Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.16);
return withAlpha(surfaceText, 0.16);
case "surfaceVariant":
return Qt.rgba(surfaceText.r, surfaceText.g, surfaceText.b, 0.16);
return withAlpha(surfaceText, 0.16);
default:
return primaryPressed;
}
@@ -1068,7 +1080,7 @@ Singleton {
readonly property color connectedSurfaceColor: {
if (typeof SettingsData === "undefined")
return withAlpha(surfaceContainer, popupTransparency);
return isConnectedEffect ? Qt.rgba(SettingsData.effectiveFrameColor.r, SettingsData.effectiveFrameColor.g, SettingsData.effectiveFrameColor.b, SettingsData.frameOpacity) : withAlpha(surfaceContainer, popupTransparency);
return isConnectedEffect ? withAlpha(SettingsData.effectiveFrameColor, SettingsData.frameOpacity) : withAlpha(surfaceContainer, popupTransparency);
}
readonly property real connectedSurfaceRadius: isConnectedEffect ? connectedCornerRadius : cornerRadius
readonly property bool connectedSurfaceBlurEnabled: (typeof SettingsData === "undefined") ? true : (!isConnectedEffect || SettingsData.frameBlurEnabled)
@@ -1468,7 +1480,7 @@ Singleton {
property string currentThemeName: currentTheme
function panelBackground() {
return Qt.rgba(surfaceContainer.r, surfaceContainer.g, surfaceContainer.b, panelTransparency);
return withAlpha(surfaceContainer, panelTransparency);
}
property real notepadTransparency: SettingsData.notepadTransparencyOverride >= 0 ? SettingsData.notepadTransparencyOverride : popupTransparency
@@ -1978,6 +1990,8 @@ Singleton {
}
function withAlpha(c, a) {
if (!c || c.r === undefined)
return Qt.rgba(0, 0, 0, 0);
return Qt.rgba(c.r, c.g, c.b, a);
}
@@ -1988,6 +2002,8 @@ Singleton {
}
function blendAlpha(c, a) {
if (!c || c.r === undefined)
return Qt.rgba(0, 0, 0, 0);
return Qt.rgba(c.r, c.g, c.b, c.a * a);
}