[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - vcl/source

[Szymon KÅ‚os (via logerrit)]

 vcl/source/control/tabctrl.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 07b0a5c1f21df487259ebf9a8af94f8d56442ba2
Author:     Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Sat Apr 25 11:28:58 2020 +0200
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Jul 10 15:14:43 2020 +0200

    tdf#123292 notebookbar: vertical align for shortcuts toolbar
    
    Change-Id: I2f2ccee9d6c01962d5d8609ea55c0c2bca6b5cb6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92892
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 96e5121869e95a8e28788a91ce0dc480e5f10c0b)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97463
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98502
    Tested-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 9990d5ca85dc..7b90e03ba5e9 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -2388,10 +2388,14 @@ bool NotebookbarTabControlBase::ImplPlaceTabs( long nWidth )
 
     // position the shortcutbox
     if (m_pShortcuts)
-        m_pShortcuts->SetPosPixel(Point(0, 0));
+    {
+        long nPosY = (m_nHeaderHeight - m_pShortcuts->GetSizePixel().getHeight()) / 2;
+        m_pShortcuts->SetPosPixel(Point(0, nPosY));
+    }
 
+    long nPosY = (m_nHeaderHeight - m_pOpenMenu->GetSizePixel().getHeight()) / 2;
     // position the menu
-    m_pOpenMenu->SetPosPixel(Point(nWidth - HAMBURGER_DIM, 0));
+    m_pOpenMenu->SetPosPixel(Point(nWidth - HAMBURGER_DIM, nPosY));
 
     return true;
 }