From 24b3b2183082d22415c8cb4d4fcf36726d3060c5 Mon Sep 17 00:00:00 2001
From: Jabiertxof <jabier.arraiza@marker.es>
Date: Mon, 16 Sep 2019 19:36:12 +0200
Subject: Active SVG2 Flow Text by default

---
 src/object/sp-text.cpp                 | 2 +-
 src/preferences-skeleton.h             | 2 +-
 src/text-chemistry.cpp                 | 2 +-
 src/ui/dialog/inkscape-preferences.cpp | 2 +-
 src/ui/tools/text-tool.cpp             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/object/sp-text.cpp b/src/object/sp-text.cpp
index 01e56633a..bf406601e 100644
--- a/src/object/sp-text.cpp
+++ b/src/object/sp-text.cpp
@@ -417,7 +417,7 @@ void SPText::show_shape_inside()
 Geom::Affine SPText::set_transform(Geom::Affine const &xform) {
     // See if 'shape-inside' has rectangle
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (prefs->getBool("/tools/text/use_svg2")) {
+    if (prefs->getBool("/tools/text/use_svg2", true)) {
         Inkscape::XML::Node* rectangle = get_first_rectangle();
         if (rectangle) {
             return xform;
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index 834473a4e..4d2a10de3 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -126,7 +126,7 @@ R"=====(
 
     <eventcontext id="text"  usecurrent="0" gradientdrag="1"
                        font_sample="AaBbCcIiPpQq12369$\342\202\254\302\242?.;/()"
-                       show_sample_in_list="1" use_svg2="0"
+                       show_sample_in_list="1" use_svg2="1"
                   style="fill:black;fill-opacity:1;line-height:1.25;stroke:none;font-family:sans-serif;font-style:normal;font-weight:normal;font-size:40px;" selcue="1"/>
 
     <eventcontext id="nodes" selcue="1" gradientdrag="1" highlight_color="0xff0000ff" pathflash_enabled="1" pathflash_unselected="0" pathflash_timeout="500" show_handles="1" show_outline="0"
diff --git a/src/text-chemistry.cpp b/src/text-chemistry.cpp
index aacc686da..fdc38467a 100644
--- a/src/text-chemistry.cpp
+++ b/src/text-chemistry.cpp
@@ -300,7 +300,7 @@ text_flow_into_shape()
     }
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (prefs->getBool("/tools/text/use_svg2")) {
+    if (prefs->getBool("/tools/text/use_svg2", true)) {
         // SVG 2 Text
 
         if (SP_IS_TEXT(text)) {
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 0b2ce78b1..52cec9538 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -478,7 +478,7 @@ void InkscapePreferences::initPageTools()
         _page_text.add_line( false, "", _font_dialog, "", _("Show font substitution warning dialog when requested fonts are not available on the system"));
 
         cb = Gtk::manage(new PrefCheckButton);
-        cb->init ( _("Use SVG2 auto-flowed text"),  "/tools/text/use_svg2", false);
+        cb->init ( _("Use SVG2 auto-flowed text"),  "/tools/text/use_svg2", true);
         _page_text.add_line( false, "", *cb, "", _("Use SVG2 auto-flowed text instead of SVG1.2 auto-flowed text. (Recommended)"));
     }
 
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 333999b9f..7434d598f 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -653,7 +653,7 @@ bool TextTool::root_handler(GdkEvent* event) {
                     if (fabs(p1[Geom::Y] - this->p0[Geom::Y]) > cursor_height) {
                         // otherwise even one line won't fit; most probably a slip of hand (even if bigger than tolerance)
 
-                        if (prefs->getBool("/tools/text/use_svg2")) {
+                        if (prefs->getBool("/tools/text/use_svg2", true)) {
                             // SVG 2 text
 
                             SPItem *text = create_text_with_rectangle (desktop, this->p0, p1);
-- 
cgit v1.2.3