add margin before/after button handles in tabbar

Change-Id: Id9b16fc4168febd217a2d263a158daca85fdea38

1 files changed, 8 insertions, 1 deletions

diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index 2477d8c3f140..217174cc960e 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -42,6 +42,7 @@ namespace {
 
 const sal_uInt16 ADDNEWPAGE_AREAWIDTH = 10;
 const sal_uInt16 INSERT_TAB_WIDTH = 32;
+const sal_uInt16 BUTTON_MARGIN = 6;
 
 } // anonymous namespace
 
@@ -1442,9 +1443,13 @@ void TabBar::Resize()
     // adapt font height?
     ImplInitSettings( true, false );
 
-    long nX = mbMirrored ? (aNewSize.Width()-nHeight) : 0;
+    long nButtonMargin = BUTTON_MARGIN * GetDPIScaleFactor();
+
+    long nX = mbMirrored ? (aNewSize.Width() - nHeight - nButtonMargin) : nButtonMargin;
     long nXDiff = mbMirrored ? -nHeight : nHeight;
 
+    nButtonWidth += nButtonMargin;
+
     Size aBtnSize( nHeight, nHeight );
     if ( mpFirstBtn )
     {
@@ -1471,6 +1476,8 @@ void TabBar::Resize()
         nButtonWidth += nHeight;
     }
 
+    nButtonWidth += nButtonMargin;
+
     // store size
     maWinSize = aNewSize;