Accessibility: white/black applet handles in GNOME high contrast themes

Special case the GNOME HighContrast and HighContrastInverse themes to give max contrast on tray and window list applet handles. Follow-on to 2e0a74d
mate-desktop · Apr 16, 2018 · 37ae832 · 37ae832
1 parent 5f38df2
commit 37ae832
Showing 1 changed file with 60 additions and 27 deletions.
diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
@@ -245,6 +245,8 @@ mate_panel_applet_frame_dbus_change_background (MatePanelAppletFrame    *frame,
 	MatePanelAppletFrameDBus *dbus_frame = MATE_PANEL_APPLET_FRAME_DBUS (frame);
 	MatePanelAppletFrameDBusPrivate *priv = dbus_frame->priv;
 	char *bg_str;
+    gchar *theme_name;
+    GtkSettings *settings;
 
 	bg_str = _mate_panel_applet_frame_get_background_string (
 			frame, PANEL_WIDGET (gtk_widget_get_parent (GTK_WIDGET (frame))), type);
@@ -264,34 +266,65 @@ mate_panel_applet_frame_dbus_change_background (MatePanelAppletFrame    *frame,
 	}
     GtkCssProvider *provider;
     provider = gtk_css_provider_new ();
-	gtk_css_provider_load_from_data (provider,
+
-		"MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { \n"
+    settings = gtk_settings_get_default();
-        "border-style: solid; \n"
+    g_object_get (settings, "gtk-theme-name", &theme_name, NULL);
-        "border-width: 3px; \n"
+
-        "border-color: transparent; \n"
+    /*Special case the GNOME high contrast themes*/
-        "background-repeat: no-repeat; \n"
+    if (g_strcmp0 (theme_name, "HighContrast") == 0 ||
-        "background-position: left; \n"
+                   g_strcmp0 (theme_name, "HighContrastInverse") == 0){
-        "background-image: linear-gradient(to bottom, \n"
+        gtk_css_provider_load_from_data (provider,
-        "transparent, \n"
+            "MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { \n"
-        "transparent 20%, \n"
+            "border-style: solid; \n"
-        "alpha (#999999, 0.6) 21%, \n"
+            "border-width: 3px; \n"
-        "alpha (#999999, 0.6) 29%, \n"
+            "border-color: @theme_bg_color; \n"
-        "transparent 30%, \n"
+            "background-repeat: no-repeat; \n"
-        "transparent 45%, \n"
+            "background-position: left; \n"
-        "alpha (#999999, 0.6) 46%, \n"
+            "background-image: linear-gradient(to bottom, \n"
-        "alpha (#999999, 0.6) 54%, \n"
+            "@theme_fg_color, \n"
-        "transparent 55%, \n"
+            "@theme_fg_color 25%, \n"
-        "transparent 70%, \n"
+            "@theme_bg_color 28%, \n"
-        "alpha (#999999, 0.6) 71%, \n"
+            "@theme_bg_color 33%, \n"
-        "alpha (#999999, 0.6) 79%, \n"
+            "@theme_fg_color 34%, \n"
-        "transparent 80%, \n"
+            "@theme_fg_color 65%, \n"
-        "transparent); \n"
+            "@theme_bg_color 66%, \n"
-        "}",
+            "@theme_bg_color 72%, \n"
-        -1, NULL);
+            "@theme_fg_color 75%, \n"
+            "@theme_fg_color); \n"
+            "}",
+            -1, NULL);
+    }
+    else{
+	    gtk_css_provider_load_from_data (provider,
+            "MatePanelAppletFrameDBus > MatePanelAppletFrameDBus { \n"
+            "border-style: solid; \n"
+            "border-width: 3px; \n"
+            "border-color: transparent; \n"
+            "background-repeat: no-repeat; \n"
+            "background-position: left; \n"
+            "background-image: linear-gradient(to bottom, \n"
+            "transparent, \n"
+            "transparent 20%, \n"
+            "alpha (#999999, 0.6) 21%, \n"
+            "alpha (#999999, 0.6) 29%, \n"
+            "transparent 30%, \n"
+            "transparent 45%, \n"
+            "alpha (#999999, 0.6) 46%, \n"
+            "alpha (#999999, 0.6) 54%, \n"
+            "transparent 55%, \n"
+            "transparent 70%, \n"
+            "alpha (#999999, 0.6) 71%, \n"
+            "alpha (#999999, 0.6) 79%, \n"
+            "transparent 80%, \n"
+            "transparent); \n"
+            "}",
+            -1, NULL);
+        }
 	gtk_style_context_add_provider (gtk_widget_get_style_context(GTK_WIDGET(frame)),
-		GTK_STYLE_PROVIDER (provider),
+                                    GTK_STYLE_PROVIDER (provider),
-		GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
+                                    GTK_STYLE_PROVIDER_PRIORITY_FALLBACK);
-	g_object_unref (provider);
+    g_object_unref (provider);
+    g_free (theme_name);
 }
 
 static void