diff options
author | lukefromdc <[email protected]> | 2018-05-23 15:08:27 -0400 |
---|---|---|
committer | lukefromdc <[email protected]> | 2018-05-23 15:08:27 -0400 |
commit | 06306441a0ee70ac79a9136a40d8e2ef365d31a2 (patch) | |
tree | 8d5715e6b14ddeb5bb6e1b1473677e456a1df1a0 | |
parent | 2aa4cec72dad5441eecff2a28730f3b0a964e991 (diff) | |
download | mate-settings-daemon-06306441a0ee70ac79a9136a40d8e2ef365d31a2.tar.bz2 mate-settings-daemon-06306441a0ee70ac79a9136a40d8e2ef365d31a2.tar.xz |
xrandr-applet-popup: handle Greybird (etc) XFCE themes
Also ensure default bg images don't override label bg color, and don't use symbolic icon in GNOME HighContrast themes as it gets the disabled color
-rw-r--r-- | plugins/xrandr/msd-xrandr-manager.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index 526f702..4222923 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -1766,6 +1766,7 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou g_string_append (string, "border-color: gray;"); g_string_append (string,"border-width: 1px;"); g_string_append (string,"border-style: inset;"); + g_string_append (string, "background-image: none;"); g_string_append (string, "background-color:"); g_string_append (string, color_string); g_string_append (string," }"); @@ -1794,6 +1795,7 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou gtk_css_provider_load_from_data (provider, ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>image{\n" "opacity: 1.0; \n" + "-gtk-icon-style:regular; \n" /* symbolic icons would get the disabled color*/ "-gtk-icon-effect: none; \n" "}", -1, NULL); @@ -1811,7 +1813,10 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou g_strcmp0 (theme_name, "Raleigh") == 0 || g_strcmp0 (theme_name, "win32") == 0 || g_strcmp0 (theme_name, "HighContrast") == 0 || - g_strcmp0 (theme_name, "HighContrastInverse") == 0){ + g_strcmp0 (theme_name, "HighContrastInverse") == 0 || + g_strcmp0 (theme_name, "Blackbird") == 0 || + g_strcmp0 (theme_name, "Bluebird") == 0 || + g_strcmp0 (theme_name, "Greybird") == 0){ gtk_css_provider_load_from_data (provider2, ".mate-panel-menu-bar menuitem.xrandr-applet:disabled>box>label{\n" "color: black;\n" |