diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-04-27 10:29:13 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-27 10:29:33 +0100 |
| commit | c223fa317376817be7a7f71c4ce9eb0011bce070 (patch) | |
| tree | 317d07aa96b69ee01f8600919ad2f405b94caec2 /vcl | |
| parent | b572cb948d33efc87f0d3d724f5ad62e7e00fe0b (diff) | |
gtk3: pull text high colors from view style
Change-Id: Id815f98db3f2db44861bf979aca4b0d24bce6589
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index 7617890e9bc0..c750644adcd0 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -1151,14 +1151,6 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetWorkspaceColor( aBackColor ); aStyleSet.SetCheckedColorSpecialCase( ); - // highlighting colors - gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_SELECTED, &text_color); - ::Color aHighlightColor = getColor( text_color ); - gtk_style_context_get_color(pStyle, GTK_STATE_FLAG_SELECTED, &text_color); - ::Color aHighlightTextColor = getColor( text_color ); - aStyleSet.SetHighlightColor( aHighlightColor ); - aStyleSet.SetHighlightTextColor( aHighlightTextColor ); - // tooltip colors GdkRGBA tooltip_bg_color, tooltip_fg_color; gtk_style_context_save (pStyle); @@ -1179,6 +1171,16 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) gtk_widget_path_iter_add_class( pCPath, -1, GTK_STYLE_CLASS_VIEW ); gtk_style_context_set_path( pCStyle, pCPath ); gtk_widget_path_free( pCPath ); + + // highlighting colors + gtk_style_context_get_background_color(pCStyle, GTK_STATE_FLAG_SELECTED, &text_color); + ::Color aHighlightColor = getColor( text_color ); + gtk_style_context_get_color(pCStyle, GTK_STATE_FLAG_SELECTED, &text_color); + ::Color aHighlightTextColor = getColor( text_color ); + aStyleSet.SetHighlightColor( aHighlightColor ); + aStyleSet.SetHighlightTextColor( aHighlightTextColor ); + + // field background color GdkRGBA field_background_color; gtk_style_context_get_background_color(pCStyle, GTK_STATE_FLAG_NORMAL, &field_background_color); g_object_unref( pCStyle ); @@ -1230,10 +1232,10 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) } gtk_style_context_get_background_color( mpMenuItemStyle, GTK_STATE_FLAG_PRELIGHT, &background_color ); - aHighlightColor = getColor( background_color ); + ::Color aHighlightColor = getColor( background_color ); gtk_style_context_get_color( mpMenuItemStyle, GTK_STATE_FLAG_PRELIGHT, &color ); - aHighlightTextColor = getColor( color ); + ::Color aHighlightTextColor = getColor( color ); if( aHighlightColor == aHighlightTextColor ) aHighlightTextColor = (aHighlightColor.GetLuminance() < 128) ? ::Color( COL_WHITE ) : ::Color( COL_BLACK ); aStyleSet.SetMenuHighlightColor( aHighlightColor ); |