Use patch for the correct version of adwaita

This commit is contained in:
Johannes Jöns 2023-07-12 13:15:17 +02:00
parent 8a8e1211cc
commit 60a9c3d4f0

View file

@ -1,11 +1,12 @@
diff --git a/src/adw-style-manager.c b/src/adw-style-manager.c
index d27ebda5..f9e725d3 100644
index 073e7890..85d96259 100644
--- a/src/adw-style-manager.c
+++ b/src/adw-style-manager.c
@@ -230,6 +230,22 @@ notify_high_contrast_cb (AdwStyleManager *self)
static void
adw_style_manager_constructed (GObject *object)
{
@@ -229,6 +229,22 @@ notify_high_contrast_cb (AdwStyleManager *self)
g_object_notify_by_pspec (G_OBJECT (self), props[PROP_HIGH_CONTRAST]);
}
+static void
+adw_style_manager_theme_changed(GSettings *settings, const char *key, GdkDisplay *display)
+{
+ char *theme = g_settings_get_string(settings, "gtk-theme");
@ -21,13 +22,12 @@ index d27ebda5..f9e725d3 100644
+}
+
+
+static void
AdwStyleManager *self = ADW_STYLE_MANAGER (object);
G_OBJECT_CLASS (adw_style_manager_parent_class)->constructed (object);
@@ -252,19 +268,14 @@ adw_style_manager_constructed (GObject *object)
static void
adw_style_manager_constructed (GObject *object)
{
@@ -254,19 +270,14 @@ adw_style_manager_constructed (GObject *object)
G_CONNECT_SWAPPED);
if (!adw_is_granite_present () && !g_getenv ("GTK_THEME")) {
- g_object_set (gtk_settings_get_for_display (self->display),
- "gtk-theme-name", "Adwaita-empty",
@ -51,5 +51,5 @@ index d27ebda5..f9e725d3 100644
+ adw_style_manager_theme_changed(interface_settings, "gtk-theme", self->display);
+ g_signal_connect (interface_settings, "changed", G_CALLBACK (adw_style_manager_theme_changed), self->display);
}
self->animations_provider = gtk_css_provider_new ();