From 0435b2db8673a12452f6af274d79f07a8640eeca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Fri, 28 Aug 2026 10:43:04 -0700 Subject: [PATCH 1/2] Remove extra style provider, set from string --- data/Application.css | 22 +++++++++++++++++++++ data/WelcomeView.css | 21 -------------------- data/io.elementary.onboarding.gresource.xml | 1 - src/Views/StyleView.vala | 4 ++-- src/Views/WelcomeView.vala | 8 ++------ 5 files changed, 26 insertions(+), 30 deletions(-) delete mode 100644 data/WelcomeView.css diff --git a/data/Application.css b/data/Application.css index d196fc88..522663f9 100644 --- a/data/Application.css +++ b/data/Application.css @@ -99,3 +99,25 @@ desktop-preview.prefer-scheduled { mix(@BLACK_300, @BLACK_500, 0.25) 51% ); } + +image.logo { + background-position: 50%; + background-size: 100%, cover, 100%; + border: 1px solid @accent_color_900; + border-radius: 6px; + box-shadow: + 0 1px 2px alpha(black, 0.3), + 0 2px 2px alpha(black, 0.1), + inset 0 -1px 0 0 alpha(@highlight_color, 0.2), + inset 0 1px 0 0 alpha(@highlight_color, 0.3), + inset 1px 0 0 0 alpha(@highlight_color, 0.07), + inset -1px 0 0 0 alpha(@highlight_color, 0.07); + color: white; + -gtk-icon-shadow: + 0 1px 1px alpha(black, 0.3), + 0 2px 4px alpha(@accent_color_900, 0.2); + -gtk-icon-style: symbolic; + min-height: 56px; + min-width: 56px; + margin: 4px; +} diff --git a/data/WelcomeView.css b/data/WelcomeView.css deleted file mode 100644 index 821e0a92..00000000 --- a/data/WelcomeView.css +++ /dev/null @@ -1,21 +0,0 @@ -image.logo { - background-position: 50%; - background-size: 100%, cover, 100%; - border: 1px solid @accent_color_900; - border-radius: 6px; - box-shadow: - 0 1px 2px alpha(black, 0.3), - 0 2px 2px alpha(black, 0.1), - inset 0 -1px 0 0 alpha(@highlight_color, 0.2), - inset 0 1px 0 0 alpha(@highlight_color, 0.3), - inset 1px 0 0 0 alpha(@highlight_color, 0.07), - inset -1px 0 0 0 alpha(@highlight_color, 0.07); - color: white; - -gtk-icon-shadow: - 0 1px 1px alpha(black, 0.3), - 0 2px 4px alpha(@accent_color_900, 0.2); - -gtk-icon-style: symbolic; - min-height: 56px; - min-width: 56px; - margin: 4px; -} diff --git a/data/io.elementary.onboarding.gresource.xml b/data/io.elementary.onboarding.gresource.xml index 3d5ab364..ea55269c 100644 --- a/data/io.elementary.onboarding.gresource.xml +++ b/data/io.elementary.onboarding.gresource.xml @@ -2,7 +2,6 @@ Application.css - WelcomeView.css appearance-default.svg appearance-dark.svg appearance-scheduled.svg diff --git a/src/Views/StyleView.vala b/src/Views/StyleView.vala index c65a694e..a6ee1648 100644 --- a/src/Views/StyleView.vala +++ b/src/Views/StyleView.vala @@ -256,7 +256,7 @@ public class Onboarding.StyleView : AbstractOnboardingView { var file = File.new_for_uri (background_uri); if (file.query_exists ()) { var background_provider = new Gtk.CssProvider (); - background_provider.load_from_data ( + background_provider.load_from_string ( """ .prefer-default { background-image: @@ -286,7 +286,7 @@ public class Onboarding.StyleView : AbstractOnboardingView { ), url("%s"); } - """.printf (background_uri, background_uri, background_uri).data + """.printf (background_uri, background_uri, background_uri) ); prefer_default_card.get_style_context ().add_provider ( diff --git a/src/Views/WelcomeView.vala b/src/Views/WelcomeView.vala index 67c05f1a..24e563d5 100644 --- a/src/Views/WelcomeView.vala +++ b/src/Views/WelcomeView.vala @@ -104,11 +104,8 @@ public class Onboarding.WelcomeView : AbstractOnboardingView { var file = File.new_for_path (file_path); if (file.query_exists ()) { - var style_provider = new Gtk.CssProvider (); - style_provider.load_from_resource ("io/elementary/onboarding/WelcomeView.css"); - var background_provider = new Gtk.CssProvider (); - background_provider.load_from_data ( + background_provider.load_from_string ( """ image.logo { background-image: @@ -119,12 +116,11 @@ public class Onboarding.WelcomeView : AbstractOnboardingView { ), url("file://%s"); } - """.printf (file_path).data + """.printf (file_path) ); image.pixel_size = 48; image.add_css_class ("logo"); - image.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); image.get_style_context ().add_provider (background_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); break; From 781216942789a4f9884d91fad432deef2a07ce8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Fri, 28 Aug 2026 10:49:04 -0700 Subject: [PATCH 2/2] Add provider to context is deprecated --- src/Views/StyleView.vala | 13 ++----------- src/Views/WelcomeView.vala | 7 ++++++- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Views/StyleView.vala b/src/Views/StyleView.vala index a6ee1648..8092b4a7 100644 --- a/src/Views/StyleView.vala +++ b/src/Views/StyleView.vala @@ -289,17 +289,8 @@ public class Onboarding.StyleView : AbstractOnboardingView { """.printf (background_uri, background_uri, background_uri) ); - prefer_default_card.get_style_context ().add_provider ( - background_provider, - Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION - ); - - prefer_dark_card.get_style_context ().add_provider ( - background_provider, - Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION - ); - - prefer_scheduled_card.get_style_context ().add_provider ( + Gtk.StyleContext.add_provider_for_display ( + Gdk.Display.get_default (), background_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION ); diff --git a/src/Views/WelcomeView.vala b/src/Views/WelcomeView.vala index 24e563d5..8c6ca59d 100644 --- a/src/Views/WelcomeView.vala +++ b/src/Views/WelcomeView.vala @@ -121,7 +121,12 @@ public class Onboarding.WelcomeView : AbstractOnboardingView { image.pixel_size = 48; image.add_css_class ("logo"); - image.get_style_context ().add_provider (background_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + + Gtk.StyleContext.add_provider_for_display ( + Gdk.Display.get_default (), + background_provider, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + ); break; }