Integrate Phase 2 desktop settings
This commit is contained in:
@@ -46,6 +46,8 @@ Singleton {
|
||||
property var displayCanConfirm: function() { return Displays.canConfirm; }
|
||||
property var confirmDisplayLayout: function() { return Displays.confirm(); }
|
||||
property var setDisplayBlocked: function(blocked) { Displays.externalChangeBlocked = blocked; }
|
||||
property var applyIdle: function() { IdleLock.apply(); }
|
||||
property var idleBusy: function() { return IdleLock.busy; }
|
||||
property var applyCompositor: function() { SystemSettings.applyPersistedDisplayPolicy(); }
|
||||
property var reloadKeybinds: function() { Keybinds.applyReload(); }
|
||||
property var keybindsReloading: function() { return Keybinds.reloading; }
|
||||
@@ -147,10 +149,11 @@ Singleton {
|
||||
// DesktopPreferences.reload() invalidates reactive shell bindings.
|
||||
// These services also own state outside QML and need an explicit
|
||||
// replay: compositor options, Lua-generated binds, and hyprpaper.
|
||||
root.applyCompositor();
|
||||
root.reloadKeybinds();
|
||||
root.applyWallpaperPolicy();
|
||||
root.applyIdle();
|
||||
root.regenerateLock();
|
||||
root.applyWallpaperPolicy();
|
||||
root.reloadKeybinds();
|
||||
root.applyCompositor();
|
||||
|
||||
settleReload.attempts = 0;
|
||||
settleReload.restart();
|
||||
@@ -167,7 +170,7 @@ Singleton {
|
||||
// Let the current instances finish their external writes before a
|
||||
// soft reload replaces them. The cap keeps a failed external tool
|
||||
// from leaving restored Home state stale indefinitely.
|
||||
if ((!root.keybindsReloading() && !root.systemBusy()
|
||||
if ((!root.idleBusy() && !root.keybindsReloading() && !root.systemBusy()
|
||||
&& !root.wallpaperBusy() && !root.lockBusy()) || attempts >= 30) {
|
||||
stop();
|
||||
root.setDisplayBlocked(false);
|
||||
|
||||
@@ -93,6 +93,8 @@ ShellRoot {
|
||||
root.record("display.block:" + blocked);
|
||||
root.displayBlocked = blocked;
|
||||
};
|
||||
SettingsBackup.applyIdle = function() { root.record("idle.apply"); };
|
||||
SettingsBackup.idleBusy = function() { return false; };
|
||||
SettingsBackup.applyCompositor = function() { root.record("system.apply"); };
|
||||
SettingsBackup.reloadKeybinds = function() { root.record("keybinds.reload"); };
|
||||
SettingsBackup.keybindsReloading = function() { return false; };
|
||||
|
||||
Reference in New Issue
Block a user