summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dufour <nicoduf@yahoo.fr>2012-01-02 07:09:19 +0000
committerJazzyNico <nicoduf@yahoo.fr>2012-01-02 07:09:19 +0000
commit5d06030e90338d750efb1691926452e53055e959 (patch)
treeef2b417790f5e6ca9063df6d2fddb9ba9e75010e
parentReplace deprecated GTK_SIGNAL_FUNC macro (diff)
downloadinkscape-5d06030e90338d750efb1691926452e53055e959.tar.gz
inkscape-5d06030e90338d750efb1691926452e53055e959.zip
Fix for bugs #910463, #910467 and #910479 (default widget size too small) by John Smith.
(bzr r10818)
-rw-r--r--src/ui/dialog/glyphs.cpp2
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp1
-rw-r--r--src/ui/dialog/input.cpp6
3 files changed, 6 insertions, 3 deletions
diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp
index 6d823e6de..84b4a34bd 100644
--- a/src/ui/dialog/glyphs.cpp
+++ b/src/ui/dialog/glyphs.cpp
@@ -342,7 +342,7 @@ GlyphsPanel::GlyphsPanel(gchar const *prefsPath) :
GtkWidget *fontsel = sp_font_selector_new();
fsel = SP_FONT_SELECTOR(fontsel);
sp_font_selector_set_font(fsel, sp_font_selector_get_font(fsel), 12.0);
-
+ gtk_widget_set_size_request (fontsel, 0, 150);
g_signal_connect( G_OBJECT(fontsel), "font_set", G_CALLBACK(fontChangeCB), this );
table->attach(*Gtk::manage(Glib::wrap(fontsel)),
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index cb4d2b755..0491ec37e 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -1474,6 +1474,7 @@ void InkscapePreferences::initPageMisc()
}
_misc_info.set_editable(false);
_misc_info_scroll.add(_misc_info);
+ _misc_info_scroll.set_size_request(0, 150);
_page_misc.add_line( false, _("System info"), _misc_info_scroll, "", _("General system information"), true);
this->AddPage(_page_misc, _("Misc"), PREFS_PAGE_MISC);
diff --git a/src/ui/dialog/input.cpp b/src/ui/dialog/input.cpp
index e80f581c1..258655599 100644
--- a/src/ui/dialog/input.cpp
+++ b/src/ui/dialog/input.cpp
@@ -545,8 +545,9 @@ InputDialogImpl::InputDialogImpl() :
treeScroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
treeScroller.add(tree);
- split2.pack1(testFrame);
- split2.pack2(frame2);
+ treeScroller.set_size_request(50, 0);
+ split2.pack1(testFrame, false, false);
+ split2.pack2(frame2, true, true);
splitter.pack1(treeScroller);
splitter.pack2(split2);
@@ -697,6 +698,7 @@ InputDialogImpl::InputDialogImpl() :
detailScroller.set_policy(Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
detailScroller.add(devDetails);
frame2.add(detailScroller);
+ frame2.set_size_request(0, 60);
//- 16x16/devices
// gnome-dev-mouse-optical