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

[Gülşah Köse (via logerrit)]

 cui/uiconfig/ui/bulletandposition.ui |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 2d4cbd062bb892d9ab4bc67d11ed02c34cd87e24
Author:     Gülşah Köse <gulsah.kose at collabora.com>
AuthorDate: Thu Jul 4 01:36:24 2019 +0300
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Tue Jul 9 13:54:08 2019 +0200

    tdf#126069 Set fixed height level and preview frames.
    
    Set fixed height for level and preview frames to avoid overlapping
    non-gtk backends. This change needed for when we set the spacing our
    list. To see real spacing, preview frame's height shouldn't be change.
    
    Change-Id: I78b5277f447f751f6e7e411cd6d5eef0b34e394a
    Reviewed-on: https://gerrit.libreoffice.org/75066
    Tested-by: Jenkins
    Reviewed-by: Gülşah Köse <gulsah.kose at collabora.com>
    (cherry picked from commit 0da9a9cdae1ad23f218f76eabaebafd61e8e8a87)
    Reviewed-on: https://gerrit.libreoffice.org/75291
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/cui/uiconfig/ui/bulletandposition.ui b/cui/uiconfig/ui/bulletandposition.ui
index d9d3a7e35fc4..0b35873974bc 100644
--- a/cui/uiconfig/ui/bulletandposition.ui
+++ b/cui/uiconfig/ui/bulletandposition.ui
@@ -181,8 +181,10 @@
             <property name="spacing">12</property>
             <child>
               <object class="GtkFrame" id="frame1">
+                <property name="height_request">440</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="valign">start</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
@@ -621,7 +623,6 @@
                                         <property name="receives_default">False</property>
                                         <property name="xalign">0</property>
                                         <property name="draw_indicator">True</property>
-                                        <property name="label" translatable="no"></property>
                                         <child>
                                           <placeholder/>
                                         </child>
@@ -972,8 +973,10 @@
             </child>
             <child>
               <object class="GtkFrame" id="frame3">
+                <property name="height_request">440</property>
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="valign">start</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
@@ -984,7 +987,6 @@
                     <child>
                       <object class="GtkScrolledWindow">
                         <property name="width_request">150</property>
-                        <property name="height_request">300</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
@@ -997,7 +999,6 @@
                             <child>
                               <object class="GtkDrawingArea" id="preview">
                                 <property name="width_request">150</property>
-                                <property name="height_request">300</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                               </object>