[Libreoffice-commits] core.git: vcl/source

[Szymon Kłos]

 vcl/source/control/tabctrl.cxx |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 51efa8fb3f92de9f8c02d2cc4e3bffcaa5caee7f
Author: Szymon Kłos <eszkadev at gmail.com>
Date:   Thu Mar 23 13:40:35 2017 +0100

    Notebookbar: move shortcuts if multiple rows of tabs
    
    Change-Id: I8b164a34eeff13d70712a84d5621d169b6528962
    Reviewed-on: https://gerrit.libreoffice.org/35588
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <eszkadev at gmail.com>

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 753aa8996a2d..52afe6b4924f 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2487,6 +2487,12 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth )
                 n++;
             }
 
+            if( m_pShortcuts && ( it == mpTabCtrlData->maItemList.begin() ) )
+            {
+                Point aPos(nIDX + nDX + nDX, nLineHeightAry[n-1]);
+                m_pShortcuts->SetPosPixel(aPos);
+            }
+
             it->maRect.Left() += nIDX;
             it->maRect.Right() += nIDX + nDX;
             it->maRect.Top() = nLineHeightAry[n-1];
@@ -2505,6 +2511,14 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth )
     }
     else
     { // only one line
+
+        if( m_pShortcuts && mpTabCtrlData
+            && mpTabCtrlData->maItemList.begin() != mpTabCtrlData->maItemList.end() )
+        {
+            Point aPos(mpTabCtrlData->maItemList.begin()->maRect.Right(), 0);
+            m_pShortcuts->SetPosPixel(aPos);
+        }
+
         if(ImplGetSVData()->maNWFData.mbCenteredTabs)
         {
             int nRightSpace = nMaxWidth;//space left on the right by the tabs