From 15fc13dde4466d3b18ffc589d6a221a894d433c7 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 24 Mar 2025 12:11:47 +0100 Subject: src/menubar.vala: Render the menubar always white (background is always black) and use black font for the hostname if shown. --- src/menubar.vala | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/menubar.vala b/src/menubar.vala index 5d193dd..63e3557 100644 --- a/src/menubar.vala +++ b/src/menubar.vala @@ -179,6 +179,20 @@ public class MenuBar : Gtk.MenuBar { add_style_class (this); + /* Handle high contrast background color */ + var menubar_style = new Gtk.CssProvider (); + + try + { + menubar_style.load_from_data ("*.high_contrast { background-color: #ffffff; }", -1); + } + catch (Error pError) + { + error ("Panic: Failed adding high contrast background-color: %s", pError.message); + } + this.get_style_context ().add_provider (menubar_style, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + /* Add shadow. */ var shadow_style = new Gtk.CssProvider (); @@ -232,7 +246,8 @@ public class MenuBar : Gtk.MenuBar var sensitive_color = hostname_item_ctx.get_color (Gtk.StateFlags.NORMAL); debug ("Directly fetched sensitive color: %s", sensitive_color.to_string ()); - insensitive_override_style.load_from_data ("*:disabled { color: %s; }".printf(sensitive_color.to_string ()), -1); + insensitive_override_style.load_from_data ("*:disabled { color: %s; } + *.high_contrast:disabled { color: #000000; }".printf(sensitive_color.to_string ()), -1); } catch (Error e) { -- cgit v1.2.3 From 21ec1e765413ee195d4f2612e84d7b728f6feb11 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 24 Mar 2025 12:12:39 +0100 Subject: src/prompt-box.vala: Prompt box messages are always white in normal mode, always black in high-contrast mode (except from errors). --- src/prompt-box.vala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/prompt-box.vala b/src/prompt-box.vala index 071c34a..1254d14 100644 --- a/src/prompt-box.vala +++ b/src/prompt-box.vala @@ -576,7 +576,8 @@ public class PromptBox : FadableBox try { var font_provider = new Gtk.CssProvider (); - var css = "* {font-family: %s; font-size: %dpt;}".printf (font_family, font_size-1); + var css = "* {font-family: %s; font-size: %dpt; color: white} + *.high_contrast {color: black; }".printf (font_family, font_size-1); font_provider.load_from_data (css, -1); style_ctx.add_provider (font_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); @@ -586,8 +587,10 @@ public class PromptBox : FadableBox debug ("Internal error loading font style (%s, %dpt): %s", font_family, font_size-1, e.message); } - Gdk.RGBA color = { 1.0f, 1.0f, 1.0f, 1.0f }; if (is_error) { + + /* red */ + Gdk.RGBA color = { 1.0f, 1.0f, 1.0f, 1.0f }; color.parse ("#820900"); /* @@ -598,9 +601,8 @@ public class PromptBox : FadableBox */ Gdk.RGBA bg_color = { 1.0f, 1.0f, 1.0f, 1.0f }; label.override_background_color (Gtk.StateFlags.NORMAL, bg_color); + label.override_color (Gtk.StateFlags.NORMAL, color); } - label.override_color (Gtk.StateFlags.NORMAL, color); - label.xalign = 0.0f; label.set_data ("prompt-box-is-error", is_error); -- cgit v1.2.3 From 8a0542ed7f8652a0404708f3eebc36fb9c081632 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 24 Mar 2025 12:14:17 +0100 Subject: src/main-window.vala: Render the back-button with black background and white border. As arrow we have a white png. --- src/main-window.vala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main-window.vala b/src/main-window.vala index 1d33ec1..cc72aef 100644 --- a/src/main-window.vala +++ b/src/main-window.vala @@ -163,7 +163,10 @@ public class MainWindow : Gtk.Window var style = new Gtk.CssProvider (); style.load_from_data ("* {background-color: transparent; %s - }".printf(shadow_style), -1); + } + *.high_contrast {background-color: black; + border-color: white; + }".printf(shadow_style), -1); var context = back_button.get_style_context(); context.add_provider (style, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); -- cgit v1.2.3