budgie-desktop ver.vump

2025-11-19 14:39:00 +03:00
parent 876829dfd6
commit a0a0585131
3 changed files with 79 additions and 1 deletions
@@ -0,0 +1,43 @@
+From 8fa59392a1817f9d15a47f3254cc69f7cb76d771 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Mon, 3 Nov 2025 14:02:59 +0100
+Subject: [PATCH] Don't read settings after bind
+
+This is actually not needed, bind() already ensures that the right item is
+selected in the combobox.
+
+Setting active_id explicitly on load causes that the value is saved back
+immediately even if it's not changed by the user, which makes the
+session-dependent default value apply also for other sessions.
+---
+ src/panel/settings/settings_style.vala | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/panel/settings/settings_style.vala b/src/panel/settings/settings_style.vala
+index de73706f7..84db6dd7f 100644
+--- a/src/panel/settings/settings_style.vala
+++ b/src/panel/settings/settings_style.vala
+@@ -154,7 +154,6 @@ namespace Budgie {
+ 					if (hit) {
+ 						combobox_gtk.sensitive = true;
+ 						ui_settings.bind("gtk-theme", combobox_gtk, "active-id", SettingsBindFlags.DEFAULT);
+-						combobox_gtk.active_id = ui_settings.get_string("gtk-theme");
+ 					}
+ 				}
+ 				/* Icon themes */ {
+@@ -172,7 +171,6 @@ namespace Budgie {
+ 					if (hit) {
+ 						combobox_icon.sensitive = true;
+ 						ui_settings.bind("icon-theme", combobox_icon, "active-id", SettingsBindFlags.DEFAULT);
+-						combobox_icon.active_id = ui_settings.get_string("icon-theme");
+ 					}
+ 				}
+ 
+@@ -191,7 +189,6 @@ namespace Budgie {
+ 					if (hit) {
+ 						combobox_cursor.sensitive = true;
+ 						ui_settings.bind("cursor-theme", combobox_cursor, "active-id", SettingsBindFlags.DEFAULT);
+-						combobox_cursor.active_id = ui_settings.get_string("cursor-theme");
+ 					}
+ 				}
+ 				queue_resize();
@@ -0,0 +1,34 @@
+From 9fec5049cc7056e609451762770c400db0f726fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Wed, 5 Nov 2025 11:59:41 +0100
+Subject: [PATCH] Reset values of caffeine mode only if needed
+
+If caffeine mode is not enabled, it's not needed to reset the unmodified
+values. Calling reset_values() unconditionally causes that the default
+values are saved as user settings on logout even if caffeine mode was not
+used.
+---
+ src/daemon/settings.vala | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/src/daemon/settings.vala b/src/daemon/settings.vala
+index fb9711325..a681e76e1 100644
+--- a/src/daemon/settings.vala
+++ b/src/daemon/settings.vala
+@@ -213,10 +213,12 @@ namespace Budgie {
+ 		* do_disable_quietly will quietly disable Caffeine Mode
+ 		*/
+ 		public void do_disable_quietly() {
+-			temporary_notification_disabled = true;
+-			wm_settings.set_boolean("caffeine-mode", false);
+-			Settings.sync();
+-			reset_values(); // Immediately reset values
+			if (get_caffeine_mode()) {
+				temporary_notification_disabled = true;
+				wm_settings.set_boolean("caffeine-mode", false);
+				Settings.sync();
+				reset_values(); // Immediately reset values
+			}
+ 		}
+ 
+ 		/**
@@ -50,7 +50,8 @@
            <Dependency>libxfce4windowing-devel</Dependency>
        </BuildDependencies>
        <Patches>
-<!--             <Patch level="1">a040ccb.patch</Patch> -->
+            <Patch level="1">9fec5049.patch</Patch>
+            <Patch level="1">8fa59392.patch</Patch>
        </Patches>
    </Source>