ooo-build r12447 - branches/ooo-build-2-4/patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Sat May  3 03:47:29 2008
New Revision: 12447
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12447&view=rev

Log:
forgot to add the patch.

Added:
   branches/ooo-build-2-4/patches/src680/svtools-adjust-sheet-tabcolor.diff

Added: branches/ooo-build-2-4/patches/src680/svtools-adjust-sheet-tabcolor.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4/patches/src680/svtools-adjust-sheet-tabcolor.diff	Sat May  3 03:47:29 2008
@@ -0,0 +1,36 @@
+diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=svtools.vpj svtools.clean/source/control/tabbar.cxx svtools/source/control/tabbar.cxx
+--- svtools.clean/source/control/tabbar.cxx	2008-05-02 23:19:10.000000000 -0400
++++ svtools/source/control/tabbar.cxx	2008-05-02 23:22:27.000000000 -0400
+@@ -518,6 +518,32 @@ void TabBar::ImplGetColors( Color& rFace
+     else
+         rSelectTextColor = rStyleSettings.GetWindowTextColor();
+ 
++    // Make sure the normal tab color is darker or brighter enough than the
++    // selected tab color.
++
++    int nDelta = abs(rSelectColor.GetRed() - rFaceColor.GetRed()) + 
++        abs(rSelectColor.GetGreen() - rFaceColor.GetGreen()) + 
++        abs(rSelectColor.GetBlue() - rFaceColor.GetBlue());
++
++    if (nDelta < 80)
++    {
++        // There isn't enough contrast between the two colors.
++        if ( rFaceColor.IsDark() )
++        {
++            double fRate = 1.0 + 2.0*(80.0 - nDelta)/80.0;
++            rFaceColor.SetRed( rFaceColor.GetRed()*fRate );
++            rFaceColor.SetGreen( rFaceColor.GetGreen()*fRate );
++            rFaceColor.SetBlue( rFaceColor.GetBlue()*fRate );
++        }
++        else
++        {
++            double fRate = 1.0 - 0.12*(80.0 - nDelta)/80.0;
++            rFaceColor.SetRed( rFaceColor.GetRed()*fRate );
++            rFaceColor.SetGreen( rFaceColor.GetGreen()*fRate );
++            rFaceColor.SetBlue( rFaceColor.GetBlue()*fRate );
++        }
++    }
++
+     // Bei 3D-Tabs wird Selektions- und Face-Farbe umgedreht, da die
+     // selektierten Tabs in 3D erscheinen sollen
+     if ( mnWinStyle & WB_3DTAB )