From 0315626909c39da0bd4395c16ba571212f1bb6df Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Thu, 7 Nov 2013 15:31:12 +0200
Subject: Avoid too wide sidebar when writedirection controls are activated
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Achieved by placing the nearby controls into the same box.

Change-Id: I28d04c8c3c5b5d9989e30d0ca18ef536640fb87a
Reviewed-on: https://gerrit.libreoffice.org/6609
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 svx/uiconfig/ui/sidebarparagraph.ui | 130 ++++++++++++++++++------------------
 1 file changed, 65 insertions(+), 65 deletions(-)

(limited to 'svx/uiconfig')

diff --git a/svx/uiconfig/ui/sidebarparagraph.ui b/svx/uiconfig/ui/sidebarparagraph.ui
index d702d15f2e57..5aac47e0a6cd 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -15,70 +15,6 @@
         <property name="row_spacing">6</property>
         <property name="column_spacing">6</property>
         <property name="column_homogeneous">True</property>
-        <child>
-          <object class="GtkToolbar" id="verticalalignment">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="has_tooltip">True</property>
-            <property name="tooltip_markup" translatable="yes">Vertical Alignment</property>
-            <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
-            <property name="halign">end</property>
-            <property name="hexpand">True</property>
-            <property name="show_arrow">False</property>
-            <child>
-              <object class="GtkToolButton" id="cellverttop">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Align Top</property>
-                <property name="tooltip_text" translatable="yes">Align Top</property>
-                <property name="action_name">.uno:CellVertTop</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="cellvertcenter">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Align Center Vertically</property>
-                <property name="tooltip_text" translatable="yes">Align Center Vertically</property>
-                <property name="action_name">.uno:CellVertCenter</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkToolButton" id="cellvertbottom">
-                <property name="width_request">25</property>
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_markup" translatable="yes">Align Bottom</property>
-                <property name="tooltip_text" translatable="yes">Align Bottom</property>
-                <property name="action_name">.uno:CellVertBottom</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="homogeneous">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkToolbar" id="numberbullet">
             <property name="visible">True</property>
@@ -730,11 +666,75 @@
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToolbar" id="verticalalignment">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_markup" translatable="yes">Vertical Alignment</property>
+                <property name="tooltip_text" translatable="yes">Vertical Alignment</property>
+                <property name="halign">end</property>
+                <property name="hexpand">True</property>
+                <property name="show_arrow">False</property>
+                <child>
+                  <object class="GtkToolButton" id="cellverttop">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Align Top</property>
+                    <property name="tooltip_text" translatable="yes">Align Top</property>
+                    <property name="action_name">.uno:CellVertTop</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="cellvertcenter">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Align Center Vertically</property>
+                    <property name="tooltip_text" translatable="yes">Align Center Vertically</property>
+                    <property name="action_name">.uno:CellVertCenter</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkToolButton" id="cellvertbottom">
+                    <property name="width_request">25</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Align Bottom</property>
+                    <property name="tooltip_text" translatable="yes">Align Bottom</property>
+                    <property name="action_name">.uno:CellVertBottom</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="homogeneous">True</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="pack_type">end</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
+            <property name="width">2</property>
             <property name="height">1</property>
           </packing>
         </child>
-- 
cgit