Merge branch 'master' into powerpencilII

4 files changed, 19 insertions, 3 deletions

diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index f6544872f..40a2a8993 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -310,7 +310,7 @@ Geom::PathVector pathliv_to_pathvector(Path *pathliv){
 // take the source paths from the file, do the operation, delete the originals and add the results
 BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, const unsigned int verb, const Glib::ustring description)
 {
-    if (nullptr != desktop() && !skip_undo) {
+    if (nullptr != desktop()) {
         SPDocument *doc = desktop()->getDocument();
         BoolOpErrors returnCode = ObjectSet::pathBoolOp(bop, true);
         switch(returnCode) {
@@ -327,10 +327,14 @@ BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo,
             boolop_display_error_message(desktop(), _("Unable to determine the <b>z-order</b> of the objects selected for difference, XOR, division, or path cut."));
             break;
         case DONE_NO_PATH:
-            DocumentUndo::done(doc, SP_VERB_NONE, description);
+            if (!skip_undo) {
+                DocumentUndo::done(doc, SP_VERB_NONE, description);
+            }
             break;
         case DONE:
-            DocumentUndo::done(doc, verb, description);
+            if (!skip_undo) {
+                DocumentUndo::done(doc, verb, description);
+            }
             break;
         }
         return returnCode;
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);
 
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 212fcf357..08a3bb5a0 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1233,28 +1233,36 @@ void SelectionVerb::perform(SPAction *action, void *data)
             break;
 
         case SP_VERB_SELECTION_OFFSET:
+            selection->toCurves(true);
             sp_selected_path_offset(dt);
             break;
         case SP_VERB_SELECTION_OFFSET_SCREEN:
+            selection->toCurves(true);
             sp_selected_path_offset_screen(dt, 1);
             break;
         case SP_VERB_SELECTION_OFFSET_SCREEN_10:
+            selection->toCurves(true);
             sp_selected_path_offset_screen(dt, 10);
             break;
         case SP_VERB_SELECTION_INSET:
+            selection->toCurves(true);
             sp_selected_path_inset(dt);
             break;
         case SP_VERB_SELECTION_INSET_SCREEN:
+            selection->toCurves(true);
             sp_selected_path_inset_screen(dt, 1);
             break;
         case SP_VERB_SELECTION_INSET_SCREEN_10:
+            selection->toCurves(true);
             sp_selected_path_inset_screen(dt, 10);
             break;
         case SP_VERB_SELECTION_DYNAMIC_OFFSET:
+            selection->toCurves(true);
             sp_selected_path_create_offset_object_zero(dt);
             tools_switch(dt, TOOLS_NODES);
             break;
         case SP_VERB_SELECTION_LINKED_OFFSET:
+            selection->toCurves(true);
             sp_selected_path_create_updating_offset_object_zero(dt);
             tools_switch(dt, TOOLS_NODES);
             break;
@@ -1266,9 +1274,11 @@ void SelectionVerb::perform(SPAction *action, void *data)
             sp_selected_path_outline(dt, true);
             break;
         case SP_VERB_SELECTION_SIMPLIFY:
+            selection->toCurves(true);
             sp_selected_path_simplify(dt);
             break;
         case SP_VERB_SELECTION_REVERSE:
+            selection->toCurves(true);
             SelectionHelper::reverse(dt);
             break;