sd/source/ui/sidebar/SlideBackground.cxx | 3 +++ sd/uiconfig/simpress/ui/sidebarslidebackground.ui | 17 ++++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-)
New commits: commit 26b8ac1fddd43af3e864c7bcc3414074e54a7bf2 Author: Caolán McNamara <[email protected]> Date: Wed Feb 22 14:59:58 2017 +0000 don't lock sidebar size due to long master slide names Change-Id: I90cbae1cbdea10d5c9bb6678535f73e8419bf8cb (cherry picked from commit ea1b27b3b579fd2896c5e054422e909c6739ad86) and... let content widgets of sidebar slide bg fill available space so if its expanded more of the master slide name can be shown Change-Id: I7dcb28e1958edf8ab7fcc03fb77c4b6a9f461ad1 (cherry picked from commit 8fcb253f706d0543e1c2eeb816f74d96cafdc6e2) Reviewed-on: https://gerrit.libreoffice.org/34548 Tested-by: Jenkins <[email protected]> Reviewed-by: Katarina Behrens <[email protected]> diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 71d2541..9e060eb 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -118,6 +118,9 @@ SlideBackground::SlideBackground( get(mpPaperSizeBox,"paperformat"); get(mpPaperOrientation, "orientation"); get(mpMasterSlide, "masterslide"); + //let the listbox shrink to any size so the sidebar isn't forced to grow to + //the size of the longest master slide name in the document + mpMasterSlide->set_width_request(0); get(mpFillAttr, "fillattr1"); get(mpFillGrad, "fillattr2"); get(mpFillStyle, "fillstyle"); diff --git a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui index 5025ede..b3e3010 100644 --- a/sd/uiconfig/simpress/ui/sidebarslidebackground.ui +++ b/sd/uiconfig/simpress/ui/sidebarslidebackground.ui @@ -1,19 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.20.0 --> <interface> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkGrid" id="SlideBackgroundPanel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">center</property> <property name="valign">start</property> <property name="margin_left">9</property> <property name="margin_right">15</property> + <property name="hexpand">True</property> <property name="border_width">6</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> @@ -46,6 +47,7 @@ <object class="GtkComboBoxText" id="orientation"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <items> <item translatable="yes">Landscape</item> <item translatable="yes">Portrait</item> @@ -60,6 +62,7 @@ <object class="svxlo-SvxFillTypeBox" id="fillstyle"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> @@ -71,6 +74,7 @@ <property name="width_request">150</property> <property name="can_focus">False</property> <property name="has_tooltip">True</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> @@ -84,6 +88,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -96,6 +101,7 @@ <object class="GtkComboBoxText" id="masterslide"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> @@ -107,7 +113,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="hexpand">True</property> <property name="ellipsize">end</property> </object> <packing> @@ -121,6 +126,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="hexpand">True</property> <property name="action_name">.uno:SelectBackground</property> </object> <packing> @@ -133,6 +139,7 @@ <property name="width_request">150</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> @@ -144,6 +151,7 @@ <property name="width_request">150</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> @@ -156,6 +164,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="hexpand">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -168,6 +177,7 @@ <object class="svxcorelo-PaperSizeListBox" id="paperformat"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> </object> <packing> <property name="left_attach">1</property> @@ -190,6 +200,7 @@ <object class="GtkBox" id="box1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="homogeneous">True</property> <child> <object class="GtkButton" id="masterslidebutton">
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
