From be85cf1026e3534236cbb87848732a9a180cda0b Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Wed, 29 Sep 2021 17:57:57 +0500 Subject: [PATCH 1/5] inspector: Build shared module instead of shared library --- src/inspector/meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/inspector/meson.build b/src/inspector/meson.build index 7f23bc501..1d5d1fc15 100644 --- a/src/inspector/meson.build +++ b/src/inspector/meson.build @@ -13,10 +13,9 @@ if get_option('inspector') 'adw-inspector-page.c', ] - shared_library( + shared_module( 'adwaita-inspector-module' + apiversion, libadwaita_inspector_sources, - soversion: soversion, dependencies: libadwaita_dep, install: true, install_dir: module_libdir, -- GitLab From 22b4d35c87238acdd8a5ab7b6d99ce5f204634f5 Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Wed, 29 Sep 2021 18:04:18 +0500 Subject: [PATCH 2/5] inspector-page: Don't reset color scheme when opening Setting supports-color-schemes can affect colors as we can't have non-default colors when it's false. Reverse the order and set color scheme first, before we lose it. --- src/inspector/adw-inspector-page.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/inspector/adw-inspector-page.c b/src/inspector/adw-inspector-page.c index 52056a5ae..c953b0a18 100644 --- a/src/inspector/adw-inspector-page.c +++ b/src/inspector/adw-inspector-page.c @@ -186,12 +186,12 @@ adw_inspector_page_init (AdwInspectorPage *self) adw_settings_start_override (self->settings); - supports = adw_settings_get_system_supports_color_schemes (self->settings); - gtk_switch_set_active (self->support_color_schemes_switch, supports); - color_scheme = adw_settings_get_color_scheme (self->settings); adw_combo_row_set_selected (self->color_scheme_row, color_scheme); + supports = adw_settings_get_system_supports_color_schemes (self->settings); + gtk_switch_set_active (self->support_color_schemes_switch, supports); + hc = adw_settings_get_high_contrast (self->settings); gtk_switch_set_active (self->high_contrast_switch, hc); } -- GitLab From 4a7c8486610edbc0f8d85a65aa5d860dddd91410 Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Wed, 29 Sep 2021 18:18:01 +0500 Subject: [PATCH 3/5] stylesheet: Drop unused css files --- src/stylesheet/gtk-dark.css | 1 - src/stylesheet/gtk-hc-dark.css | 1 - src/stylesheet/gtk-hc.css | 1 - src/stylesheet/gtk-light.css | 1 - src/stylesheet/gtk.css | 1 - 5 files changed, 5 deletions(-) delete mode 100644 src/stylesheet/gtk-dark.css delete mode 100644 src/stylesheet/gtk-hc-dark.css delete mode 100644 src/stylesheet/gtk-hc.css delete mode 100644 src/stylesheet/gtk-light.css delete mode 100644 src/stylesheet/gtk.css diff --git a/src/stylesheet/gtk-dark.css b/src/stylesheet/gtk-dark.css deleted file mode 100644 index d6711af38..000000000 --- a/src/stylesheet/gtk-dark.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-dark.css"); diff --git a/src/stylesheet/gtk-hc-dark.css b/src/stylesheet/gtk-hc-dark.css deleted file mode 100644 index 16800c347..000000000 --- a/src/stylesheet/gtk-hc-dark.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-hc-dark.css"); diff --git a/src/stylesheet/gtk-hc.css b/src/stylesheet/gtk-hc.css deleted file mode 100644 index e7e855fd9..000000000 --- a/src/stylesheet/gtk-hc.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-hc.css"); diff --git a/src/stylesheet/gtk-light.css b/src/stylesheet/gtk-light.css deleted file mode 100644 index 895ee4600..000000000 --- a/src/stylesheet/gtk-light.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-light.css"); diff --git a/src/stylesheet/gtk.css b/src/stylesheet/gtk.css deleted file mode 100644 index 895ee4600..000000000 --- a/src/stylesheet/gtk.css +++ /dev/null @@ -1 +0,0 @@ -@import url("resource:///org/gtk/libgtk/theme/Adwaita/Adwaita-light.css"); -- GitLab From 546af5d1b12b03abc12a2c425baa2abba4db3794 Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Wed, 29 Sep 2021 18:19:48 +0500 Subject: [PATCH 4/5] meson: Remove a trailing line --- src/stylesheet/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/src/stylesheet/meson.build b/src/stylesheet/meson.build index e266d2261..188c1740e 100644 --- a/src/stylesheet/meson.build +++ b/src/stylesheet/meson.build @@ -97,4 +97,3 @@ libadwaita_stylesheet_resources = gnome.compile_resources( dependencies: stylesheet_deps, c_name: 'adw_stylesheet', ) - -- GitLab From bad9233106b04f6506f529e16e0cf449305347ad Mon Sep 17 00:00:00 2001 From: Alexander Mikhaylenko Date: Wed, 29 Sep 2021 18:20:43 +0500 Subject: [PATCH 5/5] style-manager: Make our own Empty theme The GTK empty theme doesn't have a dark variant, so if an app sets gtk-application-prefer-dark-theme=true, it can break. Make our own Adwaita-empty theme to mitigate that. --- src/adw-style-manager.c | 2 +- src/stylesheet/adwaita-stylesheet.gresources.xml | 7 +++++++ src/stylesheet/empty.css | 0 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 src/stylesheet/empty.css diff --git a/src/adw-style-manager.c b/src/adw-style-manager.c index 8515e89b2..49530b591 100644 --- a/src/adw-style-manager.c +++ b/src/adw-style-manager.c @@ -248,7 +248,7 @@ adw_style_manager_constructed (GObject *object) if (!g_getenv ("GTK_THEME")) { g_object_set (gtk_settings_get_for_display (self->display), - "gtk-theme-name", "Empty", + "gtk-theme-name", "Adwaita-empty", NULL); self->provider = gtk_css_provider_new (); diff --git a/src/stylesheet/adwaita-stylesheet.gresources.xml b/src/stylesheet/adwaita-stylesheet.gresources.xml index 83ed9c02f..e4785906b 100644 --- a/src/stylesheet/adwaita-stylesheet.gresources.xml +++ b/src/stylesheet/adwaita-stylesheet.gresources.xml @@ -18,4 +18,11 @@ assets/dash-symbolic.svg assets/devel-symbolic.svg + + + empty.css + empty.css + empty.css + empty.css + diff --git a/src/stylesheet/empty.css b/src/stylesheet/empty.css new file mode 100644 index 000000000..e69de29bb -- GitLab