[Libreoffice-commits] .: vcl/unx

[Michael Meeks]

 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit a7b44da99409a7a378fb0a6b19961ca30df8d852
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jan 31 15:21:48 2012 +0000

    gtk3: clobber the page / background color to white for now.

diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index cc764da..95aa313 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -1174,15 +1174,24 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     // background colors
     GdkRGBA background_color;
     gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL, &background_color);
+
     ::Color aBackColor = getColor( background_color );
-    ::Color aBackFieldColor = getColor( background_color  );
     aStyleSet.Set3DColors( aBackColor );
     aStyleSet.SetFaceColor( aBackColor );
     aStyleSet.SetDialogColor( aBackColor );
     aStyleSet.SetWorkspaceColor( aBackColor );
+    aStyleSet.SetCheckedColorSpecialCase( );
+
+    GdkRGBA field_background_color;
+    gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_NORMAL, &field_background_color);
+    ::Color aBackFieldColor = getColor( field_background_color );
+    // FIXME: we really need some work getting the right style contexts.
+    // it seems a window has a rather different background color from what we want.
+    aBackFieldColor = ::Color( COL_WHITE );
     aStyleSet.SetFieldColor( aBackFieldColor );
+    // This baby is the default page/paper color
     aStyleSet.SetWindowColor( aBackFieldColor );
-    aStyleSet.SetCheckedColorSpecialCase( );
+
     // highlighting colors
     gtk_style_context_get_background_color(pStyle, GTK_STATE_FLAG_SELECTED, &text_color);
     ::Color aHighlightColor = getColor( text_color );