summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2012-01-02 08:10:16 +0000
committerJazzyNico <nicoduf@yahoo.fr>2012-01-02 08:10:16 +0000
commit93e419271061b1bcbf6869a7ac40c9e16bcc6cdc (patch)
treec62112f9802e77684e5e1fa4be212c5995afc0bd /src
parentFix for bugs #910463, #910467 and #910479 (default widget size too small) by ... (diff)
downloadinkscape-93e419271061b1bcbf6869a7ac40c9e16bcc6cdc.tar.gz
inkscape-93e419271061b1bcbf6869a7ac40c9e16bcc6cdc.zip
Fix for bugs #902054, #884368 and #909958 (minimum widget size) by John Smith.
(bzr r10819)
Diffstat (limited to 'src')
-rw-r--r--src/dialogs/xml-tree.cpp1
-rw-r--r--src/ui/dialog/layers.cpp7
-rw-r--r--src/ui/dialog/livepatheffect-editor.cpp1
3 files changed, 9 insertions, 0 deletions
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index 5e0766ded..98a3ee698 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -630,6 +630,7 @@ void sp_xml_tree_dialog()
gtk_box_pack_start(GTK_BOX(toolbar), sw, TRUE, TRUE, 0);
attr_value =(GtkTextView *) gtk_text_view_new();
+ gtk_widget_set_size_request((GtkWidget *)attr_value, 0, 60);
gtk_text_view_set_wrap_mode((GtkTextView *) attr_value, GTK_WRAP_CHAR);
gtk_widget_set_tooltip_text( GTK_WIDGET(attr_value),
// TRANSLATORS: "Attribute" is a noun here
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 340a1921c..b71130b20 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -618,6 +618,13 @@ LayersPanel::LayersPanel() :
_scroller.add( _tree );
_scroller.set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC );
_scroller.set_shadow_type(Gtk::SHADOW_IN);
+ Gtk:: Requisition sreq;
+ _scroller.size_request(sreq);
+ int minHeight = 70;
+ if (sreq.height < minHeight) {
+ // Set a min height to see the layers when used with Ubuntu liboverlay-scrollbar
+ _scroller.set_size_request(sreq.width, minHeight);
+ }
_watching.push_back( &_compositeSettings );
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index b48022360..44a92bfae 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -95,6 +95,7 @@ LivePathEffectEditor::LivePathEffectEditor()
scrolled_window.add(effectlist_view);
//Only show the scrollbars when they are necessary:
scrolled_window.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ scrolled_window.set_size_request(0, 50);
effectapplication_hbox.set_spacing(4);
effectcontrol_vbox.set_spacing(4);