[Libreoffice-commits] .: vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Oct 11 21:33:58 PDT 2012


 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit b19ff316441fb2d1f0537e008ea8b6fdec307224
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date:   Thu Oct 11 15:01:52 2012 +0400

    fdo#45651: gtk: fix text color with dark themes
    
    Change-Id: I959b7791151fd345c250016ae8ad315a4615a871

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index ce14634..6fd600b 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -3736,13 +3736,14 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     // text colors
     Color aTextColor = getColor( pStyle->text[GTK_STATE_NORMAL] );
     aStyleSet.SetDialogTextColor( aTextColor );
+    aStyleSet.SetWindowTextColor( aTextColor );
+    aStyleSet.SetFieldTextColor( aTextColor );
+    aTextColor = getColor( pStyle->fg[GTK_STATE_NORMAL] );
     aStyleSet.SetButtonTextColor( aTextColor );
     aStyleSet.SetRadioCheckTextColor( aTextColor );
     aStyleSet.SetGroupTextColor( aTextColor );
     aStyleSet.SetLabelTextColor( aTextColor );
     aStyleSet.SetInfoTextColor( aTextColor );
-    aStyleSet.SetWindowTextColor( aTextColor );
-    aStyleSet.SetFieldTextColor( aTextColor );
 
     // Tooltip colors
     GtkStyle* pTooltipStyle = gtk_widget_get_style( gWidgetData[m_nXScreen].gTooltipPopup );


More information about the Libreoffice-commits mailing list