ooo-build r14920 - in branches/ooo-build-3-0-1: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Dec 24 16:51:30 2008
New Revision: 14920
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14920&view=rev

Log:
2008-12-24  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/svtools-adjust-sheet-tabcolor.diff: removed the old 
	fix, which was obsoleted by the following patches.

	* patches/dev300/native-theme-tab-colors-svtools.diff:
	* patches/dev300/native-theme-tab-colors-vcl.diff: the correct fix 
	that queries theme color.
	
	* patches/dev300/apply: make the above patch set change.



Added:
   branches/ooo-build-3-0-1/patches/dev300/native-theme-tab-colors-svtools.diff
   branches/ooo-build-3-0-1/patches/dev300/native-theme-tab-colors-vcl.diff
Removed:
   branches/ooo-build-3-0-1/patches/dev300/svtools-adjust-sheet-tabcolor.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Wed Dec 24 16:51:30 2008
@@ -1277,6 +1277,11 @@
 # enable vcl to load bitmaps when height it negative
 vcl-bitmap2-negative-height.diff
 
+# Make sure that the colors between selected and unselected tabs can be
+# distinguished by using appropriate theme colors.
+native-theme-tab-colors-svtools.diff, n#396386, i#94452, kohei
+native-theme-tab-colors-vcl.diff, n#396386, i#94452, kohei
+
 [ SystemBits ]
 # use getopt() and readdir_r() from system glibc
 #FIXME src680: system-libc.diff, i#69033, rengelha
@@ -1736,10 +1741,6 @@
 # navigating through cells.
 sc-skip-overlapped-cells.diff, i#86943, n#362674, kohei
 
-# Make sure that the colors between the tabs of selected and unselected
-# sheets can be distinguished.
-svtools-adjust-sheet-tabcolor.diff, n#386029, kohei
-
 # Move cell notes along with the anchored cells when cells are sorted.
 # (disabled as it causes a crash when empty cells are present.)
 # sc-sort-cell-note-position.diff, i#59745, kohei

Added: branches/ooo-build-3-0-1/patches/dev300/native-theme-tab-colors-svtools.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/native-theme-tab-colors-svtools.diff	Wed Dec 24 16:51:30 2008
@@ -0,0 +1,22 @@
+diff --git svtools/source/control/tabbar.cxx svtools/source/control/tabbar.cxx
+index 75b9bc6..e7f492c 100644
+--- svtools/source/control/tabbar.cxx
++++ svtools/source/control/tabbar.cxx
+@@ -488,7 +488,7 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor,
+     if ( IsControlBackground() )
+         rFaceColor = GetControlBackground();
+     else
+-        rFaceColor = rStyleSettings.GetFaceColor();
++        rFaceColor = rStyleSettings.GetInactiveTabColor();
+     if ( IsControlForeground() )
+         rFaceTextColor = GetControlForeground();
+     else
+@@ -496,7 +496,7 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor,
+     if ( mbSelColor )
+         rSelectColor = maSelColor;
+     else
+-        rSelectColor = rStyleSettings.GetWindowColor();
++        rSelectColor = rStyleSettings.GetActiveTabColor();
+     if ( mbSelTextColor )
+         rSelectTextColor = maSelTextColor;
+     else

Added: branches/ooo-build-3-0-1/patches/dev300/native-theme-tab-colors-vcl.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/native-theme-tab-colors-vcl.diff	Wed Dec 24 16:51:30 2008
@@ -0,0 +1,76 @@
+diff --git vcl/inc/vcl/settings.hxx vcl/inc/vcl/settings.hxx
+index 2e26e22..01466e5 100644
+--- vcl/inc/vcl/settings.hxx
++++ vcl/inc/vcl/settings.hxx
+@@ -364,6 +364,8 @@ private:
+     Color                           maHighlightColor;
+     Color                           maHighlightLinkColor;
+     Color                           maHighlightTextColor;
++    Color                           maActiveTabColor;
++    Color                           maInactiveTabColor;
+     Color                           maInfoTextColor;
+     Color                           maLabelTextColor;
+     Color                           maLightBorderColor;
+@@ -709,6 +711,15 @@ public:
+     const Color&                    GetMonoColor() const
+                                         { return mpData->maMonoColor; }
+ 
++    void                            SetActiveTabColor( const Color& rColor )
++                                        { CopyData(); mpData->maActiveTabColor = rColor; }
++    const Color&                    GetActiveTabColor() const
++                                        { return mpData->maActiveTabColor; }
++    void                            SetInactiveTabColor( const Color& rColor )
++                                        { CopyData(); mpData->maInactiveTabColor = rColor; }
++    const Color&                    GetInactiveTabColor() const
++                                        { return mpData->maInactiveTabColor; }
++
+     void							SetHighContrastMode( BOOL bHighContrast )
+                                         { CopyData(); mpData->mnHighContrast = bHighContrast; }
+     BOOL							GetHighContrastMode() const
+diff --git vcl/source/app/settings.cxx vcl/source/app/settings.cxx
+index 2713126..42b83b2 100644
+--- vcl/source/app/settings.cxx
++++ vcl/source/app/settings.cxx
+@@ -467,6 +467,8 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
+     maHighlightColor( rData.maHighlightColor ),
+     maHighlightLinkColor( rData.maHighlightLinkColor ),
+     maHighlightTextColor( rData.maHighlightTextColor ),
++    maActiveTabColor( rData.maActiveTabColor ),
++    maInactiveTabColor( rData.maInactiveTabColor ),
+     maInfoTextColor( rData.maInfoTextColor ),
+     maLabelTextColor( rData.maLabelTextColor ),
+     maLightBorderColor( rData.maLightBorderColor ),
+@@ -599,6 +601,8 @@ void ImplStyleData::SetStandardStyles()
+     maMenuHighlightTextColor    = Color( COL_WHITE );
+     maHighlightColor            = Color( COL_BLUE );
+     maHighlightTextColor        = Color( COL_WHITE );
++    maActiveTabColor            = Color( COL_WHITE );
++    maInactiveTabColor          = Color( COL_LIGHTGRAY );
+     maDisableColor              = Color( COL_GRAY );
+     maHelpColor                 = Color( 0xFF, 0xFF, 0xE0 );
+     maHelpTextColor             = Color( COL_BLACK );
+@@ -1037,6 +1041,8 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const
+          (mpData->maMenuHighlightTextColor  == rSet.mpData->maMenuHighlightTextColor)   &&
+          (mpData->maHighlightColor          == rSet.mpData->maHighlightColor)           &&
+          (mpData->maHighlightTextColor      == rSet.mpData->maHighlightTextColor)       &&
++         (mpData->maActiveTabColor          == rSet.mpData->maActiveTabColor)           &&
++         (mpData->maInactiveTabColor        == rSet.mpData->maInactiveTabColor)         &&
+          (mpData->maDisableColor            == rSet.mpData->maDisableColor)             &&
+          (mpData->maHelpColor               == rSet.mpData->maHelpColor)                &&
+          (mpData->maHelpTextColor           == rSet.mpData->maHelpTextColor)            &&
+diff --git vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+index aebd295..e0a796b 100644
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+@@ -3196,6 +3196,11 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
+         gdk_color_free (link_color);
+     }
+ 
++    // Tab colors
++    aStyleSet.SetActiveTabColor( aBackFieldColor ); // same as the window color.
++    Color aSelectedBackColor = getColor( pStyle->bg[GTK_STATE_ACTIVE] );
++    aStyleSet.SetInactiveTabColor( aSelectedBackColor );
++
+     // menu disabled entries handling
+     aStyleSet.SetSkipDisabledInMenus( TRUE );
+     // menu colors