From e8077ee3e9409aea9cda3d04b6363d49bcaa61b9 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Tue, 21 Jul 2026 17:47:35 +0200 Subject: Stop injecting custom CSS providers --- main/src/ui/util/helper.vala | 35 ++-------------------------------- main/src/ui/util/preference_group.vala | 3 --- 2 files changed, 2 insertions(+), 36 deletions(-) (limited to 'main/src/ui/util') diff --git a/main/src/ui/util/helper.vala b/main/src/ui/util/helper.vala index 93437add..e9035be0 100644 --- a/main/src/ui/util/helper.vala +++ b/main/src/ui/util/helper.vala @@ -81,10 +81,10 @@ public static string get_occupant_display_name(StreamInteractor stream_interacto return Dino.get_occupant_display_name(stream_interactor, conversation, jid, me_is_me ? _("Me") : null); } +[Version (deprecated = true)] public static Gdk.RGBA get_label_pango_color(Label label, string css_color) { - Gtk.CssProvider provider = force_color(label, css_color); Gdk.RGBA color_rgba = label.get_style_context().get_color(); - label.get_style_context().remove_provider(provider); + label.get_style_context().lookup_color(css_color, out color_rgba); return color_rgba; } @@ -97,37 +97,6 @@ public static string rgba_to_hex(Gdk.RGBA rgba) { .up(); } -private const string force_background_css = "%s { background-color: %s; }"; -private const string force_color_css = "%s { color: %s; }"; - -public static Gtk.CssProvider force_css(Gtk.Widget widget, string css) { - var p = new Gtk.CssProvider(); - try { -#if GTK_4_12 && (VALA_0_56_GREATER_11 || VALA_0_58) - p.load_from_string(css); -#elif (VALA_0_56_11 || VALA_0_56_12) - p.load_from_data(css, css.length); -#else - p.load_from_data(css.data); -#endif - widget.get_style_context().add_provider(p, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - } catch (GLib.Error err) { - // handle err - } - return p; -} - -public static void force_background(Gtk.Widget widget, string color, string selector = "*") { - force_css(widget, force_background_css.printf(selector, color)); -} - -public static Gtk.CssProvider force_color(Gtk.Widget widget, string color, string selector = "*") { - return force_css(widget, force_color_css.printf(selector, color)); -} - -public static void force_error_color(Gtk.Widget widget, string selector = "*") { - force_color(widget, "@error_color", selector); -} public static bool is_dark_theme(Gtk.Widget widget) { Gdk.RGBA bg = widget.get_style_context().get_color(); diff --git a/main/src/ui/util/preference_group.vala b/main/src/ui/util/preference_group.vala index 3911bb80..f34f0d92 100644 --- a/main/src/ui/util/preference_group.vala +++ b/main/src/ui/util/preference_group.vala @@ -86,9 +86,6 @@ namespace Dino.Ui.Util { }; row_text.bind_property("text", view, "subtitle", BindingFlags.SYNC_CREATE, null_string_to_empty); view.add_css_class("property"); - - Util.force_css(view, "row.property > box.header > box.title > .title { font-weight: 400; font-size: 9pt; opacity: 0.55; }"); - Util.force_css(view, "row.property > box.header > box.title > .subtitle { font-size: inherit; opacity: 1; }"); } var toggle_view_model = preferences_row as ViewModel.PreferencesRow.Toggle; -- cgit v1.3