[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source

[Jan Holesovsky]

 sfx2/source/dialog/backingwindow.cxx |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 2e266a77951ac54b9c72667e046440bb2b5d81b3
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Jun 22 21:45:13 2015 +0200

    tdf#91971: Add the menubar size to the height computation too.
    
    Change-Id: Ic03dc9e811df624ca492cd2688a30a1e07fe6496
    Reviewed-on: https://gerrit.libreoffice.org/16414
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index d58f856..22d4e80 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -338,8 +338,18 @@ void BackingWindow::initControls()
 
     Resize();
 
+    // compute the menubar height
+    sal_Int32 nMenuHeight = 0;
+    SystemWindow* pSystemWindow = GetSystemWindow();
+    if (pSystemWindow)
+    {
+        MenuBar* pMenuBar = pSystemWindow->GetMenuBar();
+        if (pMenuBar)
+            nMenuHeight = pMenuBar->ImplGetWindow()->GetOutputSizePixel().Height();
+    }
+
     set_width_request(mpAllRecentThumbnails->get_width_request() + mpAllButtonsBox->GetOptimalSize().Width());
-    set_height_request(mpAllButtonsBox->GetOptimalSize().Height());
+    set_height_request(nMenuHeight + mpAllButtonsBox->GetOptimalSize().Height());
 }
 
 void BackingWindow::initializeLocalView()