summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2018-12-16 12:25:18 -0500
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-07-26 20:25:47 +0200
commit8ac95e67872d8834c12adf67f833d92b06dc3d70 (patch)
tree95ba347cc12b3134d86e91be60a8493d5975a8ce
parent80eb913d5944e88297b0734991bcf6c1cfb34463 (diff)
sfx: LOK: fix the minimum height of sidebars
Change-Id: I29d4eb38c72db50061266f0cf0ace31bab690315 Reviewed-on: https://gerrit.libreoffice.org/73521 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index a0f9cbd1dae4..f099e5f7c5d2 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -408,11 +408,10 @@ void SidebarController::NotifyResize()
// No TabBar in LOK.
if (comphelper::LibreOfficeKit::isActive())
{
- const sal_Int32 nMinimalHeight = mpCurrentDeck->GetMinimalHeight();
- if (nMinimalHeight > 0)
- mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nMinimalHeight);
- else
- mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, nHeight);
+ // The minimal deck height is unreliable because of
+ // the fluid way the panels are stretched. Fix minimum manually.
+ // const sal_Int32 nMinimalHeight = mpCurrentDeck->GetMinimalHeight();
+ mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth, 600);
}
else
mpCurrentDeck->setPosSizePixel(nDeckX, 0, nWidth - nTabBarDefaultWidth, nHeight);