summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-05-05 13:31:29 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-05-05 21:36:49 +0000
commit921f69baa078dfd2b96004880538a22306a06367 (patch)
treee4617ee48cebaa672c0b01998bd42a29b8db11e5
parent31c2a2230e6debd0fa53656f6a2159918d2d67d8 (diff)
use a sizegroup to stop area panel 'jumping'
toolbox and lists are a little different in height naturally causing a little jump in layout on toggling between color and anything else Change-Id: I0b2ab92ab2fb5bec7d7fecc7aeaf15f47781a67b (cherry picked from commit 7fb784ff2c58f7ad89b0f961fee76e3a363841ff) Reviewed-on: https://gerrit.libreoffice.org/15637 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--svx/uiconfig/ui/sidebararea.ui31
1 files changed, 10 insertions, 21 deletions
diff --git a/svx/uiconfig/ui/sidebararea.ui b/svx/uiconfig/ui/sidebararea.ui
index cbea7cb64cc5..adad038abfda 100644
--- a/svx/uiconfig/ui/sidebararea.ui
+++ b/svx/uiconfig/ui/sidebararea.ui
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
- <!-- interface-requires LibreOffice 1.0 -->
+ <requires lib="gtk+" version="3.0"/>
+ <requires lib="LibreOffice" version="1.0"/>
<object class="GtkGrid" id="AreaPropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -36,8 +37,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -53,8 +52,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -64,7 +61,6 @@
<property name="hexpand">True</property>
<child>
<object class="sfxlo-SidebarToolBox" id="selectcolor">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkMenuToolButton" id="color">
@@ -91,7 +87,6 @@
</child>
<child>
<object class="svxlo-SvxFillAttrBox" id="fillattr">
- <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Select the effect to apply.</property>
@@ -107,8 +102,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -126,8 +119,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -137,8 +128,6 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Select the type of transparency to apply.</property>
<property name="tooltip_text" translatable="yes">Select the type of transparency to apply.</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
<items>
<item translatable="yes">None</item>
<item translatable="yes">Solid</item>
@@ -153,8 +142,6 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -198,7 +185,6 @@
<property name="hexpand">True</property>
<property name="max_length">100</property>
<property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
<property name="secondary_icon_activatable">False</property>
<property name="climb_rate">5</property>
<property name="numeric">True</property>
@@ -213,8 +199,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -234,9 +218,14 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
</object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <property name="mode">both</property>
+ <widgets>
+ <widget name="selectcolor"/>
+ <widget name="fillattr"/>
+ </widgets>
+ </object>
</interface>