diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-29 01:58:22 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-29 01:58:22 +0000 |
| commit | a934cd7f07c9135b7c24d57b41acfb2fc748d1bf (patch) | |
| tree | c1ced5468286e5550ee2359aa4ca6b1e4a995fe0 /src/ui | |
| parent | Allow erase knots in powerstroke (diff) | |
| parent | Merge branch 'attrvaluesize' of gitlab.com:darktrojan/inkscape (diff) | |
| download | inkscape-a934cd7f07c9135b7c24d57b41acfb2fc748d1bf.tar.gz inkscape-a934cd7f07c9135b7c24d57b41acfb2fc748d1bf.zip | |
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/text-edit.cpp | 1 | ||||
| -rw-r--r-- | src/ui/dialog/xml-tree.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/ui/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index f6b2305b1..33c173a1c 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -372,6 +372,7 @@ void TextEdit::setPreviewText (Glib::ustring font_spec, Glib::ustring phrase) Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); double pt_size = Inkscape::Util::Quantity::convert(sp_style_css_size_units_to_px(sp_font_selector_get_size(fsel), unit), "px", "pt"); + pt_size = std::min(pt_size, 100.0); // Pango font size is in 1024ths of a point // C++11: Glib::ustring size = std::to_string( int(pt_size * PANGO_SCALE) ); diff --git a/src/ui/dialog/xml-tree.cpp b/src/ui/dialog/xml-tree.cpp index 6429e655d..03a4d9bf5 100644 --- a/src/ui/dialog/xml-tree.cpp +++ b/src/ui/dialog/xml-tree.cpp @@ -231,6 +231,7 @@ XmlTree::XmlTree (void) : Gtk::ScrolledWindow *scroller = new Gtk::ScrolledWindow(); scroller->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC ); scroller->set_shadow_type(Gtk::SHADOW_IN); + scroller->set_size_request(0, 60); attr_vbox.pack_start(*scroller, TRUE, TRUE, 0); |