summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-02-07 11:28:33 +0000
committerAndras Timar <andras.timar@collabora.com>2017-02-10 12:54:02 +0100
commit7c85a941c0c26c54e2daf10a934aa24cfd1815d3 (patch)
treedfbb9213ba13f36f43b335d63e9d1f913221542d /sd
parent7536352820a22e32e4ea4d0c53b24d4956a4777b (diff)
animation duration/scale etc don't fill horizontal space
(cherry picked from commit d18089ec0a2a8758eda889a7b9b23b66128484d5) Change-Id: Ie211827c2f8231384b98fb08e0371a839e3dc41c Reviewed-on: https://gerrit.libreoffice.org/33997 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 43d64e9b0b634a682f5987bc6401e3207af25598)
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/animations/CustomAnimationDialog.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 8d9434b5b32b..c0a54499b047 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -117,6 +117,7 @@ PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, vcl::Window* pPare
: PropertySubControl( nControlType ), maModifyLink(rModifyHdl)
{
mpControl = VclPtr<ListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
+ mpControl->set_hexpand(true);
mpControl->SetDropDownLineCount( 10 );
mpControl->SetSelectHdl( LINK(this, PresetPropertyBox, OnSelect) );
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX );
@@ -200,6 +201,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, vcl::Window* pParent
{
mpControl = VclPtr<ColorListBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
mpControl->SetDropDownLineCount( 10 );
+ mpControl->set_hexpand(true);
mpControl->SetSelectHdl( LINK(this, ColorPropertyBox, OnSelect) );
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX );
@@ -279,6 +281,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, vcl::Window* pParent,
: PropertySubControl( nControlType ), maModifyHdl(rModifyHdl)
{
mpControl = VclPtr<FontNameBox>::Create( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN );
+ mpControl->set_hexpand(true);
mpControl->SetDropDownLineCount( 10 );
mpControl->SetSelectHdl( LINK(this, FontPropertyBox, ControlSelectHdl) );
mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX );
@@ -366,6 +369,7 @@ DropdownMenuBox::DropdownMenuBox( vcl::Window* pParent, Edit* pSubControl, Popup
mpDropdownButton->SetPopupMenu( pMenu );
SetSubEdit( mpSubControl );
+ set_hexpand(true);
mpSubControl->SetParent( this );
mpSubControl->Show();
}