isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-23 16:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

frames: don't force dark theme to all windows

Browse Source 
Use global theme variant only if window does not have _GTK_THEME_VARIANT
property. This allows applications to request default theme variant when
global dark theme is enabled.

https://bugzilla.gnome.org/show_bug.cgi?id=761543
This commit is contained in:
Alberts Muktupāvels 2016-02-04 15:26:50 +02:00
parent e5ce6192f4
commit 247909e161
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/frames.c
View File

@ -447,7 +447,7 @@ meta_frames_new (int screen_number)
} }
static const char * static const char *
get_theme_variant_override (MetaFrames *frames) get_global_theme_variant (MetaFrames *frames)
{ {
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (frames)); GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (frames));
GtkSettings *settings = gtk_settings_get_for_screen (screen); GtkSettings *settings = gtk_settings_get_for_screen (screen);
@ -474,17 +474,13 @@ meta_ui_frame_attach_style (MetaUIFrame *frame)
{ {
MetaFrames *frames = frame->frames; MetaFrames *frames = frame->frames;
const char *variant; const char *variant;
const char *variant_override;
if (frame->style_info != NULL) if (frame->style_info != NULL)
meta_style_info_unref (frame->style_info); meta_style_info_unref (frame->style_info);
variant_override = get_theme_variant_override (frame->frames);
if (variant_override)
variant = variant_override;
else
variant = frame->meta_window->gtk_theme_variant; variant = frame->meta_window->gtk_theme_variant;
if (variant == NULL)
variant = get_global_theme_variant (frame->frames);;
if (variant == NULL || *variant == '\0') if (variant == NULL || *variant == '\0')
frame->style_info = meta_style_info_ref (frames->normal_style); frame->style_info = meta_style_info_ref (frames->normal_style);