sfx2/source/sidebar/DeckLayouter.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 09ddec08eaa0af1ca6a5f8a376abae9e62fe2607
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
AuthorDate: Sun Dec 8 11:26:27 2019 -0500
Commit: Ashod Nakashian <ashnak...@gmail.com>
CommitDate: Mon Dec 9 04:42:51 2019 +0100
sidebar: no scrollbar in LOK
Scrolling in LOK is done in the client. We render
the sidebar as long as the original height is
(the minimum that will fit all panels) and scroll
in the client. For that, we keep the scrollbar
disabled when layouting the Deck.
Change-Id: If0d813b04af679768f80ee88fc976bce9cde46d2
Reviewed-on: https://gerrit.libreoffice.org/84720
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
diff --git a/sfx2/source/sidebar/DeckLayouter.cxx
b/sfx2/source/sidebar/DeckLayouter.cxx
index c1b35df89525..0337c7cc46d6 100644
--- a/sfx2/source/sidebar/DeckLayouter.cxx
+++ b/sfx2/source/sidebar/DeckLayouter.cxx
@@ -22,6 +22,7 @@
#include <sfx2/sidebar/Panel.hxx>
#include <sfx2/sidebar/PanelTitleBar.hxx>
#include <sfx2/sidebar/Deck.hxx>
+#include <comphelper/lok.hxx>
#include <vcl/window.hxx>
#include <vcl/scrbar.hxx>
@@ -169,9 +170,8 @@ tools::Rectangle LayoutPanels (
nTotalPreferredHeight += item.maLayoutSize.Preferred;
}
-
- if (nTotalMinimumHeight > nAvailableHeight
- && ! bShowVerticalScrollBar)
+ if (nTotalMinimumHeight > nAvailableHeight && !bShowVerticalScrollBar
+ && !comphelper::LibreOfficeKit::isActive())
{
// Not enough space, even when all panels are shrunk to their
// minimum height.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
