[Libreoffice-commits] core.git: cui/uiconfig

[Libreoffice Gerrit user]

 cui/uiconfig/ui/dimensionlinestabpage.ui |   23 +++++++++++++++++------
 cui/uiconfig/ui/linetabpage.ui           |    2 ++
 2 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit 03422ee447a69abfb0b263decc1362bcefb650ee
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Oct 18 11:36:21 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Oct 18 15:48:01 2018 +0200

    align the various previews to the same place
    
    Change-Id: Ice5bb1db9f4bec803121c160a1f74c0d24551b40
    Reviewed-on: https://gerrit.libreoffice.org/61929
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/uiconfig/ui/dimensionlinestabpage.ui b/cui/uiconfig/ui/dimensionlinestabpage.ui
index 760304e7b2de..6b40182af823 100644
--- a/cui/uiconfig/ui/dimensionlinestabpage.ui
+++ b/cui/uiconfig/ui/dimensionlinestabpage.ui
@@ -40,6 +40,8 @@
   <object class="GtkBox" id="DimensionLinesTabPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="hexpand">True</property>
+    <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">6</property>
@@ -474,20 +476,29 @@
       </packing>
     </child>
     <child>
-      <object class="GtkScrolledWindow">
+      <object class="GtkAlignment">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="hscrollbar_policy">never</property>
-        <property name="vscrollbar_policy">never</property>
-        <property name="shadow_type">in</property>
+        <property name="top_padding">6</property>
+        <property name="left_padding">12</property>
+        <property name="right_padding">12</property>
         <child>
-          <object class="GtkViewport">
+          <object class="GtkScrolledWindow">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">never</property>
+            <property name="shadow_type">in</property>
             <child>
-              <object class="GtkDrawingArea" id="CTL_PREVIEW">
+              <object class="GtkViewport">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkDrawingArea" id="CTL_PREVIEW">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
diff --git a/cui/uiconfig/ui/linetabpage.ui b/cui/uiconfig/ui/linetabpage.ui
index fff6e55459eb..c2334ef0f872 100644
--- a/cui/uiconfig/ui/linetabpage.ui
+++ b/cui/uiconfig/ui/linetabpage.ui
@@ -878,7 +878,9 @@
       <object class="GtkAlignment" id="alignment6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="top_padding">6</property>
         <property name="left_padding">12</property>
+        <property name="right_padding">12</property>
         <child>
           <object class="GtkScrolledWindow">
             <property name="visible">True</property>