summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Dominguez <venccsralph@gmail.com>2012-06-29 21:37:47 -0430
committerRafael Dominguez <venccsralph@gmail.com>2012-06-29 21:37:47 -0430
commitbbd206d6fb2fcecec51c2703e42b9e275b740c2e (patch)
tree81cf3f12002752b57877db97ea9b1ce4d5e47c33
parent4863f32f39e730b62ed26ff5689712530de1d811 (diff)
Set scrollbar offset as a class attribute.
Change-Id: I4127b799937771c99b69ecb8a29729c8bc3a31cc
-rw-r--r--sfx2/inc/sfx2/thumbnailview.hxx1
-rw-r--r--sfx2/source/control/thumbnailview.cxx10
2 files changed, 6 insertions, 5 deletions
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 9c40f700fcd1..2d6bb20349c6 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -335,6 +335,7 @@ protected:
long mnLines;
long mnUserItemWidth;
long mnUserItemHeight;
+ sal_uInt16 mnScrBarOffset;
sal_uInt16 mnSelItemId;
sal_uInt16 mnHighItemId;
sal_uInt16 mnCols;
diff --git a/sfx2/source/control/thumbnailview.cxx b/sfx2/source/control/thumbnailview.cxx
index 46b0e0eb0614..4a5ebc4bb534 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -48,7 +48,6 @@ enum
NAME_LINE_OFF_Y = 2,
NAME_LINE_HEIGHT = 2,
NAME_OFFSET = 2,
- SCRBAR_OFFSET = 1,
SCROLL_OFFSET = 4
};
@@ -94,6 +93,7 @@ void ThumbnailView::ImplInit()
mnUserItemWidth = 0;
mnUserItemHeight = 0;
mnFirstLine = 0;
+ mnScrBarOffset = 1;
mnSelItemId = 0;
mnHighItemId = 0;
mnCols = 0;
@@ -250,7 +250,7 @@ void ThumbnailView::CalculateItemPositions ()
// calculate ScrollBar width
long nScrBarWidth = 0;
if ( mpScrBar )
- nScrBarWidth = mpScrBar->GetSizePixel().Width()+SCRBAR_OFFSET;
+ nScrBarWidth = mpScrBar->GetSizePixel().Width()+mnScrBarOffset;
// calculate maximum number of visible columns
mnCols = (sal_uInt16)((aWinSize.Width()-nScrBarWidth) / (mnItemWidth));
@@ -366,8 +366,8 @@ void ThumbnailView::CalculateItemPositions ()
// arrange ScrollBar, set values and show it
if ( mpScrBar )
{
- Point aPos( aWinSize.Width()-nScrBarWidth+SCRBAR_OFFSET, mnHeaderHeight );
- Size aSize( nScrBarWidth-SCRBAR_OFFSET, aWinSize.Height() - mnHeaderHeight );
+ Point aPos( aWinSize.Width() - nScrBarWidth - mnScrBarOffset, mnHeaderHeight );
+ Size aSize( nScrBarWidth - mnScrBarOffset, aWinSize.Height() - mnHeaderHeight );
mpScrBar->SetPosSizePixel( aPos, aSize );
mpScrBar->SetRangeMax( mnLines );
@@ -1238,7 +1238,7 @@ long ThumbnailView::GetScrollWidth() const
if ( GetStyle() & WB_VSCROLL )
{
((ThumbnailView*)this)->ImplInitScrollBar();
- return mpScrBar->GetSizePixel().Width()+SCRBAR_OFFSET;
+ return mpScrBar->GetSizePixel().Width()+mnScrBarOffset;
}
else
return 0;