[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source sw/uiconfig

[Caolán McNamara (via logerrit)]

 sw/source/ui/config/optcomp.cxx         |    3 +++
 sw/uiconfig/swriter/ui/optcompatpage.ui |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 07a95dbe5843a2dc3c02daad904d00baa71fa99c
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 11 17:20:16 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jun 12 14:12:50 2019 +0200

    Resolves: tdf#125799 only let doc options grow/shrink
    
    and give the global list of just 1 entry space for 2 to take the bare
    look off it, if there end up with more entries here, then let it take
    its natural size at that point
    
    Change-Id: Ic1834dc90cdcc061636ad49d69c301c7b570db3e
    Reviewed-on: https://gerrit.libreoffice.org/73833
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index b00d6ed073cb..fff81e5e82a5 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -115,6 +115,9 @@ SwCompatibilityOptPage::SwCompatibilityOptPage(vcl::Window* pParent, const SfxIt
 
     m_pGlobalOptionsCLB->SetStyle( m_pGlobalOptionsCLB->GetStyle() | WB_HSCROLL | WB_HIDESELECTION );
     m_pGlobalOptionsCLB->SetHighlightRange();
+    // tdf#125799, we let only the doc options grow/shrink but give this one more than its bare
+    // min request height because there's only one row in it and that looks somewhat abrupt
+    m_pGlobalOptionsCLB->set_height_request(m_pGlobalOptionsCLB->get_preferred_size().Height() * 2);
 
     InitControls( rSet );
 
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui b/sw/uiconfig/swriter/ui/optcompatpage.ui
index 1e2942b79c21..abb693a99a02 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -123,7 +123,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
-        <property name="vexpand">True</property>
+        <property name="vexpand">False</property>
         <property name="label_xalign">0</property>
         <property name="shadow_type">none</property>
         <child>
@@ -131,7 +131,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
+            <property name="vexpand">False</property>
             <property name="top_padding">6</property>
             <property name="left_padding">12</property>
             <child>
@@ -144,7 +144,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
+                    <property name="vexpand">False</property>
                     <child internal-child="selection">
                       <object class="GtkTreeSelection" id="Check List Box-selection1"/>
                     </child>