Very basic theming support
This commit is contained in:
parent
b08944988d
commit
821b4e8cad
6 changed files with 309 additions and 58 deletions
143
Theme/Theme.qml
Normal file
143
Theme/Theme.qml
Normal file
|
|
@ -0,0 +1,143 @@
|
|||
// Theme.qml
|
||||
pragma Singleton
|
||||
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Io
|
||||
import qs.Services
|
||||
|
||||
Singleton {
|
||||
id: root
|
||||
|
||||
// Backgrounds
|
||||
property color backgroundPrimary: themeData.backgroundPrimary
|
||||
property color backgroundSecondary: themeData.backgroundSecondary
|
||||
property color backgroundTertiary: themeData.backgroundTertiary
|
||||
|
||||
// Surfaces & Elevation
|
||||
property color surface: themeData.surface
|
||||
property color surfaceVariant: themeData.surfaceVariant
|
||||
|
||||
// Text Colors
|
||||
property color textPrimary: themeData.textPrimary
|
||||
property color textSecondary: themeData.textSecondary
|
||||
property color textDisabled: themeData.textDisabled
|
||||
|
||||
// Accent Colors
|
||||
property color accentPrimary: themeData.accentPrimary
|
||||
property color accentSecondary: themeData.accentSecondary
|
||||
property color accentTertiary: themeData.accentTertiary
|
||||
|
||||
// Error/Warning
|
||||
property color error: themeData.error
|
||||
property color warning: themeData.warning
|
||||
|
||||
// Highlights & Focus
|
||||
property color highlight: themeData.highlight
|
||||
property color rippleEffect: themeData.rippleEffect
|
||||
|
||||
// Additional Theme Properties
|
||||
property color onAccent: themeData.onAccent
|
||||
property color outline: themeData.outline
|
||||
|
||||
// Shadows & Overlays
|
||||
property color shadow: applyOpacity(themeData.shadow, "B3")
|
||||
property color overlay: applyOpacity(themeData.overlay, "66")
|
||||
|
||||
// Font Properties
|
||||
property string fontFamily: "Roboto" // Family for all text
|
||||
|
||||
// Design reference resolution (for scale = 1.0)
|
||||
readonly property int designScreenWidth: 2560
|
||||
readonly property int designScreenHeight: 1440
|
||||
|
||||
// Automatic, orientation-agnostic scaling
|
||||
function scale(currentScreen) {
|
||||
return 1.0
|
||||
// // 1) Per-monitor override wins
|
||||
// try {
|
||||
// const overrides = Settings.settings.monitorScaleOverrides || {};
|
||||
// if (currentScreen && currentScreen.name && overrides[currentScreen.name] !== undefined) {
|
||||
// const overrideValue = overrides[currentScreen.name]
|
||||
// if (isFinite(overrideValue)) return overrideValue
|
||||
// }
|
||||
// } catch (e) {
|
||||
// // ignore
|
||||
// }
|
||||
|
||||
// // 2) Fallback: scale by diagonal pixel count relative to design resolution
|
||||
// try {
|
||||
// const w = Math.max(1, currentScreen ? (currentScreen.width || 0) : 0)
|
||||
// const h = Math.max(1, currentScreen ? (currentScreen.height || 0) : 0)
|
||||
// if (w > 1 && h > 1) {
|
||||
// const diag = Math.sqrt(w * w + h * h)
|
||||
// const baseDiag = Math.sqrt(designScreenWidth * designScreenWidth + designScreenHeight * designScreenHeight)
|
||||
// const ratio = diag / baseDiag
|
||||
// // Clamp to a reasonable range for UI legibility
|
||||
// return Math.max(0.9, Math.min(1.6, ratio))
|
||||
// }
|
||||
// } catch (e) {
|
||||
// // ignore and fall through
|
||||
// }
|
||||
|
||||
// // 3) Safe default
|
||||
// return 1.0
|
||||
}
|
||||
|
||||
function applyOpacity(color, opacity) {
|
||||
return color.replace("#", "#" + opacity)
|
||||
}
|
||||
|
||||
// FileView to load theme data from JSON file
|
||||
FileView {
|
||||
id: themeFile
|
||||
path: Settings.themeFile
|
||||
watchChanges: true
|
||||
onFileChanged: reload()
|
||||
onAdapterUpdated: writeAdapter()
|
||||
onLoadFailed: function (error) {
|
||||
if (error.toString().includes("No such file") || error === 2) {
|
||||
// File doesn't exist, create it with default values
|
||||
writeAdapter()
|
||||
}
|
||||
}
|
||||
JsonAdapter {
|
||||
id: themeData
|
||||
|
||||
// Backgrounds
|
||||
property string backgroundPrimary: "#191724"
|
||||
property string backgroundSecondary: "#1f1d2e"
|
||||
property string backgroundTertiary: "#26233a"
|
||||
|
||||
// Surfaces & Elevation
|
||||
property string surface: "#1f1d2e"
|
||||
property string surfaceVariant: "#37354c"
|
||||
|
||||
// Text Colors
|
||||
property string textPrimary: "#e0def4"
|
||||
property string textSecondary: "#908caa"
|
||||
property string textDisabled: "#6e6a86"
|
||||
|
||||
// Accent Colors
|
||||
property string accentPrimary: "#ebbcba"
|
||||
property string accentSecondary: "#31748f"
|
||||
property string accentTertiary: "#9ccfd8"
|
||||
|
||||
// Error/Warning
|
||||
property string error: "#eb6f92"
|
||||
property string warning: "#f6c177"
|
||||
|
||||
// Highlights & Focus
|
||||
property string highlight: "#c4a7e7"
|
||||
property string rippleEffect: "#9ccfd8"
|
||||
|
||||
// Additional Theme Properties
|
||||
property string onAccent: "#191724"
|
||||
property string outline: "#44415a"
|
||||
|
||||
// Shadows & Overlays
|
||||
property string shadow: "#191724"
|
||||
property string overlay: "#191724"
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue