Remove legacy hamburger code

5 files changed, 31 insertions, 40 deletions

diff --git a/share/icons/Tango/scalable/actions/hamburger-menu.svg b/share/icons/Tango/scalable/actions/hamburger-menu.svg
deleted file mode 100644
index 0dc95e58d..000000000
--- a/share/icons/Tango/scalable/actions/hamburger-menu.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="distribute-remove-overlaps-symbolic.svg"><sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g transform="matrix(0.727273,0,0,0.666667,-840.72727,-548.90812)" inkscape:label="00292" id="distribute-remove-overlaps">
-      <path inkscape:connector-curvature="0" id="rect19455" d="m 1156,823.36218 h 22 v 24 h -22 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="rect19457" d="m 1159.9273,827.852 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34075 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.27449 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z m 0,5.625 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34075 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.27449 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z m 0,5.625 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34074 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.2745 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z" style="opacity:1"/>
-    </g>
-    </svg>
diff --git a/share/icons/hicolor/scalable/actions/hamburger-menu.svg b/share/icons/hicolor/scalable/actions/hamburger-menu.svg
deleted file mode 100644
index 0dc95e58d..000000000
--- a/share/icons/hicolor/scalable/actions/hamburger-menu.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="distribute-remove-overlaps-symbolic.svg"><sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g transform="matrix(0.727273,0,0,0.666667,-840.72727,-548.90812)" inkscape:label="00292" id="distribute-remove-overlaps">
-      <path inkscape:connector-curvature="0" id="rect19455" d="m 1156,823.36218 h 22 v 24 h -22 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="rect19457" d="m 1159.9273,827.852 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34075 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.27449 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z m 0,5.625 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34075 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.27449 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z m 0,5.625 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34074 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.2745 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z" style="opacity:1"/>
-    </g>
-    </svg>
diff --git a/share/icons/hicolor/symbolic/actions/hamburger-menu-symbolic.svg b/share/icons/hicolor/symbolic/actions/hamburger-menu-symbolic.svg
deleted file mode 100644
index 0dc95e58d..000000000
--- a/share/icons/hicolor/symbolic/actions/hamburger-menu-symbolic.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
-<svg xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="distribute-remove-overlaps-symbolic.svg"><sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="0.6002936" inkscape:cx="732.67439" inkscape:cy="-567.94603" inkscape:window-width="1920" inkscape:window-height="1016" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="layer1">
-    <inkscape:grid type="xygrid" id="grid"/>
-  </sodipodi:namedview>
-  <g transform="matrix(0.727273,0,0,0.666667,-840.72727,-548.90812)" inkscape:label="00292" id="distribute-remove-overlaps">
-      <path inkscape:connector-curvature="0" id="rect19455" d="m 1156,823.36218 h 22 v 24 h -22 z" style="opacity:0;fill:none"/>
-      <path inkscape:connector-curvature="0" id="rect19457" d="m 1159.9273,827.852 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34075 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.27449 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z m 0,5.625 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34075 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.27449 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z m 0,5.625 c -0.3407,0 -0.6152,0.27449 -0.6152,0.61523 v 2.53906 c 0,0.34074 0.2745,0.61524 0.6152,0.61524 h 14.1445 c 0.3408,0 0.6153,-0.2745 0.6153,-0.61524 v -2.53906 c 0,-0.34074 -0.2745,-0.61523 -0.6153,-0.61523 z" style="opacity:1"/>
-    </g>
-    </svg>
diff --git a/share/ui/style.css b/share/ui/style.css
index 84aec2223..cb3f3aaee 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -328,12 +328,6 @@ spinbutton undershoot {
     font-size: 7pt;
 }
 
-#line_spacing_menu > box *{
-	margin:1px;
-}
-
-
-
 /* The actual canvas (Inkscape's drawing area). */
 
 SPCanvas {
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index 969baff4e..16dbc7046 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -863,6 +863,8 @@ TextToolbar::fontsize_value_changed()
     } else {
         osfs << size << sp_style_get_css_unit_string(unit);
     }
+
+  
     sp_repr_css_set_property (css, "font-size", osfs.str().c_str());
     SPILengthOrNormal font_size("font-size");
     font_size.read(osfs.str().c_str());
@@ -872,10 +874,35 @@ TextToolbar::fontsize_value_changed()
     // the style on the outer <text> objects we need to bypass this call.
     // bool outer = prefs->getInt("/tools/text/outer_style", false);
     SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    _freeze = false;
-    lineheight_value_changed_wrapped(font_size.computed);
-    _freeze = true;
-    sp_desktop_set_style(desktop, css, true, true);
+    if (_sub_selection_items.empty()) {
+        Inkscape::Selection *selection = desktop->getSelection();
+        auto itemlist= selection->items();
+        for(auto i=itemlist.begin();i!=itemlist.end(); ++i){
+            if (dynamic_cast<SPText *>(*i) || dynamic_cast<SPFlowtext *>(*i)) {
+                SPItem *item = *i;
+
+                // Scale by inverse of accumulated parent transform
+                SPCSSAttr *css_set = sp_repr_css_attr_new();
+                sp_repr_css_merge(css_set, css);
+                Geom::Affine const local(item->i2doc_affine());
+                double const ex(local.descrim());
+                if ( (ex != 0.0) && (ex != 1.0) ) {
+                    sp_css_attr_scale(css_set, 1/ex);
+                }
+                _freeze = false;
+                lineheight_value_changed_wrapped(font_size.computed);
+                _freeze = true;
+                item->changeCSS(css_set,"style");
+
+                sp_repr_css_attr_unref(css_set);
+            }
+        }
+    } else {
+        _freeze = false;
+        lineheight_value_changed_wrapped(font_size.computed);
+        _freeze = true;
+        sp_desktop_set_style (desktop, css, true, true);
+    }
 
 
     // If no selected objects, set default.