diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-16 10:14:06 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-16 11:33:20 +0100 |
| commit | 363446eb61de141deb1364805e0d7cd0e1f6d7fe (patch) | |
| tree | ee1d0e11a8c3b99fe3ebf3b9ec2e85c6be1a6d6e /sd/source/ui/sidebar | |
| parent | 6eb840cc540bb6f2efcebc0349a8e6e7ba074cd8 (diff) | |
Resolves: fdo#69236 route size request to layout widget, not hard-coded value
a) For the sidebar the sidebars automatically handle scrolling, but for the
older panel the widgets has to do the scrolling so add scrolling parents to the
.ui
b) Fold the DialogListBox scrolling widget implementation into
VclScrolledWindow and remove the duplication.
Change-Id: Ife9ccd8c501e5dee7bf3102a92c8261d979cd834
Diffstat (limited to 'sd/source/ui/sidebar')
| -rw-r--r-- | sd/source/ui/sidebar/CustomAnimationPanel.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/SlideTransitionPanel.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/sidebar/CustomAnimationPanel.cxx b/sd/source/ui/sidebar/CustomAnimationPanel.cxx index f2b38af7ba1d..95e7f3352f7f 100644 --- a/sd/source/ui/sidebar/CustomAnimationPanel.cxx +++ b/sd/source/ui/sidebar/CustomAnimationPanel.cxx @@ -23,7 +23,6 @@ namespace sd { extern ::Window * createCustomAnimationPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame); - extern sal_Int32 getCustomAnimationPanelMinimumHeight (::Window* pParent); } namespace sd { namespace sidebar { @@ -66,7 +65,8 @@ CustomAnimationPanel::~CustomAnimationPanel (void) css::ui::LayoutSize CustomAnimationPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/) { - const sal_Int32 nMinimumHeight(getCustomAnimationPanelMinimumHeight(mpWrappedControl.get())); + Window *pControl = mpWrappedControl.get(); + sal_Int32 nMinimumHeight = pControl ? pControl->get_preferred_size().Height() : 0; return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight); } diff --git a/sd/source/ui/sidebar/SlideTransitionPanel.cxx b/sd/source/ui/sidebar/SlideTransitionPanel.cxx index f48f592cb57b..8e0b906244ac 100644 --- a/sd/source/ui/sidebar/SlideTransitionPanel.cxx +++ b/sd/source/ui/sidebar/SlideTransitionPanel.cxx @@ -23,7 +23,6 @@ namespace sd { extern ::Window* createSlideTransitionPanel (::Window* pParent, ViewShellBase& rBase, const cssu::Reference<css::frame::XFrame>& rxFrame); - extern sal_Int32 getSlideTransitionPanelMinimumHeight (::Window* pParent); } @@ -67,7 +66,8 @@ SlideTransitionPanel::~SlideTransitionPanel (void) css::ui::LayoutSize SlideTransitionPanel::GetHeightForWidth (const sal_Int32 /*nWidth*/) { - const sal_Int32 nMinimumHeight(getSlideTransitionPanelMinimumHeight(mpWrappedControl.get())); + Window *pControl = mpWrappedControl.get(); + sal_Int32 nMinimumHeight = pControl ? pControl->get_preferred_size().Height() : 0; return css::ui::LayoutSize(nMinimumHeight,-1, nMinimumHeight); } |