mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-30 08:22:51 -05:00
Fix light mode binding
This commit is contained in:
@@ -74,7 +74,6 @@ Singleton {
|
|||||||
property bool qtThemingEnabled: typeof SettingsData !== "undefined" ? (SettingsData.qt5ctAvailable || SettingsData.qt6ctAvailable) : false
|
property bool qtThemingEnabled: typeof SettingsData !== "undefined" ? (SettingsData.qt5ctAvailable || SettingsData.qt6ctAvailable) : false
|
||||||
property var workerRunning: false
|
property var workerRunning: false
|
||||||
property var matugenColors: ({})
|
property var matugenColors: ({})
|
||||||
property int colorUpdateTrigger: 0
|
|
||||||
property var customThemeData: null
|
property var customThemeData: null
|
||||||
|
|
||||||
readonly property string stateDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.CacheLocation).toString()) + "/dankshell"
|
readonly property string stateDir: Paths.strip(StandardPaths.writableLocation(StandardPaths.CacheLocation).toString()) + "/dankshell"
|
||||||
@@ -84,7 +83,6 @@ Singleton {
|
|||||||
matugenCheck.running = true
|
matugenCheck.running = true
|
||||||
if (typeof SessionData !== "undefined") {
|
if (typeof SessionData !== "undefined") {
|
||||||
SessionData.isLightModeChanged.connect(root.onLightModeChanged)
|
SessionData.isLightModeChanged.connect(root.onLightModeChanged)
|
||||||
isLightMode = SessionData.isLightMode
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (typeof SettingsData !== "undefined" && SettingsData.currentThemeName) {
|
if (typeof SettingsData !== "undefined" && SettingsData.currentThemeName) {
|
||||||
@@ -100,7 +98,6 @@ Singleton {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function getMatugenColor(path, fallback) {
|
function getMatugenColor(path, fallback) {
|
||||||
colorUpdateTrigger
|
|
||||||
const colorMode = (typeof SessionData !== "undefined" && SessionData.isLightMode) ? "light" : "dark"
|
const colorMode = (typeof SessionData !== "undefined" && SessionData.isLightMode) ? "light" : "dark"
|
||||||
let cur = matugenColors && matugenColors.colors && matugenColors.colors[colorMode]
|
let cur = matugenColors && matugenColors.colors && matugenColors.colors[colorMode]
|
||||||
for (const part of path.split(".")) {
|
for (const part of path.split(".")) {
|
||||||
@@ -578,10 +575,6 @@ Singleton {
|
|||||||
|
|
||||||
|
|
||||||
function onLightModeChanged() {
|
function onLightModeChanged() {
|
||||||
if (matugenColors && Object.keys(matugenColors).length > 0) {
|
|
||||||
colorUpdateTrigger++
|
|
||||||
}
|
|
||||||
|
|
||||||
if (currentTheme === "custom" && customThemeFileView.path) {
|
if (currentTheme === "custom" && customThemeFileView.path) {
|
||||||
customThemeFileView.reload()
|
customThemeFileView.reload()
|
||||||
}
|
}
|
||||||
@@ -905,7 +898,6 @@ Singleton {
|
|||||||
const colorsText = dynamicColorsFileView.text()
|
const colorsText = dynamicColorsFileView.text()
|
||||||
if (colorsText) {
|
if (colorsText) {
|
||||||
root.matugenColors = JSON.parse(colorsText)
|
root.matugenColors = JSON.parse(colorsText)
|
||||||
root.colorUpdateTrigger++
|
|
||||||
if (typeof ToastService !== "undefined") {
|
if (typeof ToastService !== "undefined") {
|
||||||
ToastService.clearWallpaperError()
|
ToastService.clearWallpaperError()
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user