Attachment 60503 Details for Bug 42100 – diff of the fixes, updated to fix the problem Kohei mentioned

[patch] diff of the fixes, updated to fix the problem Kohei mentioned

scroll_fix.diff (text/plain), 7.13 KB, created by Forest Johnson on 2012-04-23 19:32:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forest Johnson

Created: 2012-04-23 19:32:16 UTC

Size: 7.13 KB

patch

obsolete

>diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx
>index 5691234..7967f69 100644
>--- a/sc/source/ui/inc/tabcont.hxx
>+++ b/sc/source/ui/inc/tabcont.hxx
>@@ -39,7 +39,7 @@ class ScViewData;
> // ---------------------------------------------------------------------------
> 
> //  initial size
>-#define SC_TABBAR_DEFWIDTH      270
>+#define SC_TABBAR_CTRLWIDTH      108
> 
> 
> class ScTabControl : public TabBar, public DropTargetHelper, public DragSourceHelper
>diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
>index 230736a..6c1661b 100644
>--- a/sc/source/ui/view/tabcont.cxx
>+++ b/sc/source/ui/view/tabcont.cxx
>@@ -90,7 +90,7 @@ ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) :
> 
>     SetCurPageId( static_cast<sal_uInt16>(pViewData->GetTabNo()) + 1 );
> 
>-    SetSizePixel( Size(SC_TABBAR_DEFWIDTH, 0) );
>+    SetSizePixel( Size(GetPreferredWidth() + SC_TABBAR_CTRLWIDTH, 0) );
> 
>     SetSplitHdl( LINK( pViewData->GetView(), ScTabView, TabBarResize ) );
> 
>diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
>index 8e8124a..553defc 100644
>--- a/sc/source/ui/view/tabview.cxx
>+++ b/sc/source/ui/view/tabview.cxx
>@@ -508,13 +508,20 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner )
>             long nTabSize = 0;
>             if (bTabControl)
>             {
>-                // pending relative tab bar width from extended document options
>-                if( mfPendingTabBarWidth >= 0.0 )
>+                // if this is the first time that resize has happened and the pending tab bar width is not set to anything, set it.
>+                if(mfPendingTabBarWidth == -1.0) 
>                 {
>-                    SetRelTabBarWidth( mfPendingTabBarWidth );
>-                    mfPendingTabBarWidth = -1.0;
>+                    long nWindowWidth = pFrameWin->GetSizePixel().Width();
>+                    if(nWindowWidth != 0) mfPendingTabBarWidth = ((double)(pTabControl->GetPreferredWidth() + SC_TABBAR_CTRLWIDTH) / nWindowWidth);
>+                    if (mfPendingTabBarWidth < 0.0) mfPendingTabBarWidth = 0.0;
>+                    if (mfPendingTabBarWidth > 1.0) mfPendingTabBarWidth = 1.0;
>                 }
>-
>+                
>+                // Always base the width of the tab bar on it's width relative to the window.
>+                if(mfPendingTabBarWidth != -1.0) {
>+                     SetRelTabBarWidth( mfPendingTabBarWidth );
>+                }
>+				
>                 nTabSize = pTabControl->GetSizePixel().Width()-nOverlap;
> 
>                 if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX )    // bei linkem Scrollbar
>@@ -912,6 +919,11 @@ IMPL_LINK( ScTabView, TabBarResize, void*, EMPTYARG )
>     {
>         const long nOverlap = 0;    // ScrollBar::GetWindowOverlapPixel();
>         long nSize = pTabControl->GetSplitSize();
>+        long nWindowWidth = pFrameWin->GetSizePixel().Width();
>+
>+        if(nWindowWidth != 0) mfPendingTabBarWidth = ((float)nSize / nWindowWidth);
>+        if (mfPendingTabBarWidth < 0.0) mfPendingTabBarWidth = 0.0;
>+        if (mfPendingTabBarWidth > 1.0) mfPendingTabBarWidth = 1.0;
> 
>         if (aViewData.GetHSplitMode() != SC_SPLIT_FIX)
>         {
>diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
>index 3d30fad..dab8dfa 100644
>--- a/sc/source/ui/view/tabview5.cxx
>+++ b/sc/source/ui/view/tabview5.cxx
>@@ -433,13 +433,14 @@ void ScTabView::ViewOptionsHasChanged( bool bHScrollChanged, bool bGraphicsChang
>     bool bGrow = ( aViewData.IsTabMode() && pTabControl->GetSizePixel().Width() <= 0 );
> 
>     // if ScrollBar is set to visible, TabBar must make room
>+    long nTotalWidth = pTabControl->GetPreferredWidth() + SC_TABBAR_CTRLWIDTH;
>     bool bShrink = ( bHScrollChanged && aViewData.IsTabMode() && aViewData.IsHScrollMode() &&
>-                     pTabControl->GetSizePixel().Width() > SC_TABBAR_DEFWIDTH );
>+                     pTabControl->GetSizePixel().Width() > nTotalWidth );
> 
>     if ( bGrow || bShrink )
>     {
>         Size aSize = pTabControl->GetSizePixel();
>-        aSize.Width() = SC_TABBAR_DEFWIDTH;             // initial size
>+        aSize.Width() = nTotalWidth;             // initial size
>         pTabControl->SetSizePixel(aSize);               // DoResize is called later...
>     }
> }
>diff --git a/svtools/inc/svtools/tabbar.hxx b/svtools/inc/svtools/tabbar.hxx
>index 1478b0e6..70e9c31 100644
>--- a/svtools/inc/svtools/tabbar.hxx
>+++ b/svtools/inc/svtools/tabbar.hxx
>@@ -378,6 +378,7 @@ private:
>     sal_Bool            mbSelTextColor;
>     sal_Bool            mbMirrored;
>     bool            mbHasInsertTab; // if true, the tab bar has an extra tab at the end.
>+    bool			mbTabsLastMovedBySplitter;
>     Link            maSelectHdl;
>     Link            maDoubleClickHdl;
>     Link            maSplitHdl;
>@@ -462,6 +463,9 @@ public:
>     Rectangle       GetPageRect( sal_uInt16 nPageId ) const;
>     // returns the rectangle in which page tabs are drawn
>     Rectangle       GetPageArea() const;
>+    // returns ideal width for the tab bar:
>+    sal_uInt16		GetPreferredWidth() const;
>+    
> 
>     void            SetCurPageId( sal_uInt16 nPageId );
>     sal_uInt16          GetCurPageId() const { return mnCurPageId; }
>diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
>index 54476afe..5dec801 100644
>--- a/svtools/source/control/tabbar.cxx
>+++ b/svtools/source/control/tabbar.cxx
>@@ -407,6 +407,7 @@ void TabBar::ImplInit( WinBits nWinStyle )
>     mbSelColor      = sal_False;
>     mbSelTextColor  = sal_False;
>     mbMirrored      = sal_False;
>+    mbTabsLastMovedBySplitter = false;
> 
>     if ( nWinStyle & WB_3DTAB )
>         mnOffY++;
>@@ -561,6 +562,20 @@ void TabBar::ImplGetColors( Color& rFaceColor, Color& rFaceTextColor,
> 
> // -----------------------------------------------------------------------
> 
>+sal_uInt16 TabBar::GetPreferredWidth() const
>+{
>+	long nAccum = 0;
>+    for ( size_t i = 0, n = mpItemList->size(); i < n; ++i )
>+    {
>+        ImplTabBarItem* pItem = (*mpItemList)[ i ];
>+        long nWidth = GetTextWidth( pItem->maText );
>+        nAccum += nWidth + 3*TABBAR_OFFSET_X+2*TABBAR_OFFSET_X2;
>+    }
>+    return sal_uInt16 ( nAccum );
>+}
>+
>+// -----------------------------------------------------------------------
>+
> sal_Bool TabBar::ImplCalcWidth()
> {
>     // Groessen muessen nur ermittelt werden, wenn sich Text aendert oder
>@@ -827,7 +842,10 @@ IMPL_LINK( TabBar, ImplClickHdl, ImplTabButton*, pBtn )
>     }
> 
>     if ( nNewPos != mnFirstPos )
>+    {
>+         mbTabsLastMovedBySplitter = false;
>         SetFirstPageId( GetPageId( nNewPos ) );
>+    }
>     return 0;
> }
> 
>@@ -1517,7 +1535,17 @@ void TabBar::Resize()
>             Invalidate();
>         ImplFormat();
>     }
>-
>+    
>+    // Show more tabs if there's enough space - 
>+    // then, once this has happened, allow the separator to push back the tabs. 
>+    // (It will no longer do this once a tab or scroll button has been clicked)
>+    sal_uInt16 nLastFirstPos = ImplGetLastFirstPos();
>+    if ( nLastFirstPos < mnFirstPos || mbTabsLastMovedBySplitter)
>+    {
>+        mbTabsLastMovedBySplitter = true;
>+        SetFirstPageId( GetPageId( nLastFirstPos ) );
>+    }
>+    
>     // Button enablen/disablen
>     ImplEnableControls();
> }

Actions: View | Splinter Review

Attachments on bug 42100: 52644 | 58579 | 60503

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.