summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
authorAshod Nakashian <ashod.nakashian@collabora.co.uk>2018-12-10 00:29:31 -0500
committerNoel Grandin <noel.grandin@collabora.co.uk>2019-07-26 20:19:09 +0200
commita6f6a76d6018fd342646982f6e252c8562ebd254 (patch)
tree70a10c5b8a14aa9e13d0a4aee57d1c9cf3aeaa2b /include/sfx2
parent682a91a9c8822a6cfb5377b26facea2572f34027 (diff)
sfx: LOK: don't shrink sidebar height below minimum
This avoids scrolling within the sidebar and makes it possible to scroll the rendred sidebar image in the client, which is more responsive and lighter. Change-Id: I0713c699ba82bfc5fe503c9351402c67aef4494e Reviewed-on: https://gerrit.libreoffice.org/73519 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/sidebar/Deck.hxx2
-rw-r--r--include/sfx2/sidebar/DeckLayouter.hxx1
2 files changed, 3 insertions, 0 deletions
diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index 22ecb71536d0..410f17a22e82 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -69,6 +69,7 @@ public:
static void PrintWindowSubTree (vcl::Window* pRoot, int nIndentation);
sal_Int32 GetMinimalWidth() const { return mnMinimalWidth; }
+ sal_Int32 GetMinimalHeight() const { return mnMinimalHeight; }
class ScrollContainerWindow : public vcl::Window
{
@@ -83,6 +84,7 @@ public:
private:
const OUString msId;
sal_Int32 mnMinimalWidth;
+ sal_Int32 mnMinimalHeight;
SharedPanelContainer maPanels;
VclPtr<DeckTitleBar> mpTitleBar;
VclPtr<vcl::Window> mpScrollClipWindow;
diff --git a/include/sfx2/sidebar/DeckLayouter.hxx b/include/sfx2/sidebar/DeckLayouter.hxx
index 1208fb94c164..0d9c7c2b90f4 100644
--- a/include/sfx2/sidebar/DeckLayouter.hxx
+++ b/include/sfx2/sidebar/DeckLayouter.hxx
@@ -35,6 +35,7 @@ namespace DeckLayouter
void LayoutDeck (
const tools::Rectangle& rContentArea,
sal_Int32& rMinimalWidth,
+ sal_Int32& rMinimalHeight,
SharedPanelContainer& rPanels,
vcl::Window& pDeckTitleBar,
vcl::Window& pScrollClipWindow,