1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-04-13 01:02:18 -04:00

Connected frames & defaults

This commit is contained in:
purian23
2026-03-24 20:21:44 -04:00
parent 2b2b6f7a55
commit 8419c560b1
11 changed files with 102 additions and 31 deletions

View File

@@ -14,7 +14,7 @@ import "settings/SettingsStore.js" as Store
Singleton {
id: root
readonly property int settingsConfigVersion: 9
readonly property int settingsConfigVersion: 10
readonly property bool isGreeterMode: Quickshell.env("DMS_RUN_GREETER") === "1" || Quickshell.env("DMS_RUN_GREETER") === "true"
@@ -201,9 +201,9 @@ Singleton {
property bool frameEnabled: false
onFrameEnabledChanged: saveSettings()
property real frameThickness: 15
property real frameThickness: 16
onFrameThicknessChanged: saveSettings()
property real frameRounding: 24
property real frameRounding: 23
onFrameRoundingChanged: saveSettings()
property string frameColor: ""
onFrameColorChanged: saveSettings()
@@ -213,7 +213,7 @@ Singleton {
onFrameSyncBarColorChanged: saveSettings()
property var frameScreenPreferences: ["all"]
onFrameScreenPreferencesChanged: saveSettings()
property real frameBarThickness: 48
property real frameBarThickness: 42
onFrameBarThicknessChanged: saveSettings()
property bool frameShowOnOverview: false
onFrameShowOnOverviewChanged: saveSettings()
@@ -1976,6 +1976,14 @@ Singleton {
return Quickshell.screens.filter(screen => isScreenInPreferences(screen, prefs));
}
function getFrameScreensAlways() {
const prefs = frameScreenPreferences;
if (!prefs || prefs.length === 0 || prefs.includes("all")) {
return Quickshell.screens;
}
return Quickshell.screens.filter(s => prefs.includes(s.name));
}
function getActiveBarEdgeForScreen(screen) {
if (!screen) return "";
for (var i = 0; i < barConfigs.length; i++) {

View File

@@ -552,8 +552,8 @@ var SPEC = {
launcherPluginOrder: { def: [] },
frameEnabled: { def: false },
frameThickness: { def: 15 },
frameRounding: { def: 24 },
frameThickness: { def: 16 },
frameRounding: { def: 23 },
frameColor: { def: "" },
frameOpacity: { def: 1.0 },
frameSyncBarColor: { def: true },

View File

@@ -252,8 +252,8 @@ function migrateToVersion(obj, targetVersion) {
console.info("Migrating settings from version", currentVersion, "to version 7");
if (settings.frameEnabled === undefined) settings.frameEnabled = false;
if (settings.frameThickness === undefined) settings.frameThickness = 15;
if (settings.frameRounding === undefined) settings.frameRounding = 24;
if (settings.frameThickness === undefined) settings.frameThickness = 16;
if (settings.frameRounding === undefined) settings.frameRounding = 23;
if (settings.frameColor === undefined) settings.frameColor = "#2a2a2a";
if (settings.frameOpacity === undefined) settings.frameOpacity = 1.0;
if (settings.frameSyncBarColor === undefined) settings.frameSyncBarColor = true;
@@ -265,7 +265,7 @@ function migrateToVersion(obj, targetVersion) {
if (currentVersion < 8) {
console.info("Migrating settings from version", currentVersion, "to version 8");
if (settings.frameBarThickness === undefined) settings.frameBarThickness = 48;
if (settings.frameBarThickness === undefined) settings.frameBarThickness = 42;
settings.configVersion = 8;
}
@@ -278,6 +278,11 @@ function migrateToVersion(obj, targetVersion) {
settings.configVersion = 9;
}
// v10 migration — Session 5
if (currentVersion < 10) {
settings.configVersion = 10;
}
return settings;
}