summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-07-21 00:53:04 +0000
committerJohn Smith <john.smith7545@yahoo.com>2012-07-21 00:53:04 +0000
commite785e5c44e6ea23abe3693e0dc56d0dea8489d97 (patch)
tree1cd80ef77f8466f792ed1a458d918491780f14e9 /src
parentFix for 940578 : Max font size in toolbar font chooser (diff)
downloadinkscape-e785e5c44e6ea23abe3693e0dc56d0dea8489d97.tar.gz
inkscape-e785e5c44e6ea23abe3693e0dc56d0dea8489d97.zip
Fix for 908392 : Swatches dialog minimum size
(bzr r11559)
Diffstat (limited to 'src')
-rw-r--r--src/ui/dialog/swatches.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 092887541..68bafe549 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -636,6 +636,19 @@ SwatchesPanel::SwatchesPanel(gchar const* prefsPath) :
}
}
+ if (Glib::ustring(prefsPath) == "/dialogs/swatches") {
+ Gtk::Requisition sreq;
+#if WITH_GTKMM_3_0
+ Gtk::Requisition sreq_natural;
+ get_preferred_size(sreq_natural, sreq);
+#else
+ sreq = size_request();
+#endif
+ int minHeight = 60;
+ if (sreq.height < minHeight) {
+ set_size_request(70, minHeight);
+ }
+ }
_getContents()->pack_start(*_holder, Gtk::PACK_EXPAND_WIDGET);
_setTargetFillable(_holder);