svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 12 +++++++++---
svx/uiconfig/ui/sidebarparagraph.ui | 18 ++++++++++++------
2 files changed, 21 insertions(+), 9 deletions(-)
New commits:
commit 65a384eaa1d186868548f7d3d864229836332c84
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Feb 7 15:00:45 2014 +0000
set smaller preferred width for sidebar para spinners
i.e. use a size that's big enough for sane values to
fit, rather than full range of legal values. Width
space is at a premium here.
Change-Id: I5d34048690729415deaabec431eb16e43c5b7a0a
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 393c92a..219d8fc 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -1493,14 +1493,20 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
get(mpTBxBackColor, "backgroundcolor");
//Paragraph spacing
get(mpTopDist, "aboveparaspacing");
+ mpTopDist->set_width_request(mpTopDist->get_preferred_size().Width());
get(mpBottomDist, "belowparaspacing");
+
mpBottomDist->set_width_request(mpBottomDist->get_preferred_size().Width());
+ get(mpLeftIndent, "beforetextindent");
+
mpLeftIndent->set_width_request(mpLeftIndent->get_preferred_size().Width());
+ get(mpRightIndent, "aftertextindent");
+
mpRightIndent->set_width_request(mpRightIndent->get_preferred_size().Width());
+ get(mpFLineIndent, "firstlineindent");
+
mpFLineIndent->set_width_request(mpFLineIndent->get_preferred_size().Width());
+
get(mpTbxIndent_IncDec, "indent");
get(mpTbxProDemote, "promotedemote");
get(mpLineSPTbx, "linespacing");
get(mpTbxUL_IncDec, "paraspacing");
- get(mpLeftIndent, "beforetextindent");
- get(mpRightIndent, "aftertextindent");
- get(mpFLineIndent, "firstlineindent");
initial();
}
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui
b/svx/uiconfig/ui/sidebarparagraph.ui
index 5aac47e..9c3125a 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -1,7 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkGrid" id="ParaPropertyPanel">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -338,7 +344,7 @@
<property name="tooltip_text" translatable="yes">Above
Paragraph Spacing</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
- <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -380,7 +386,7 @@
<property name="tooltip_text" translatable="yes">Below
Paragraph Spacing</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
- <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -419,7 +425,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
- <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -458,7 +464,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
- <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="expand">False</property>
@@ -497,7 +503,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="invisible_char">â¢</property>
- <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
</object>
<packing>
<property name="expand">False</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
