X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdesktop-style.cpp;h=c8782051bef6772088cef4d5b985488a00f16381;hb=07deead54b814f1bcae352a059bc3eea74233a1b;hp=b8af828ad4b58edc62deae647e0594cc008ce23e;hpb=26b62dfb088a00b6debad350538a64c2af145f50;p=inkscape.git

diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index b8af828ad..c8782051b 100644
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
@@ -23,9 +23,9 @@
 #include "selection.h"
 #include "inkscape.h"
 #include "style.h"
-#include "prefs-utils.h"
+#include "preferences.h"
 #include "sp-use.h"
-#include "sp-feblend.h"
+#include "filters/blend.h"
 #include "sp-filter.h"
 #include "sp-filter-reference.h"
 #include "sp-gaussian-blur.h"
@@ -120,8 +120,8 @@ sp_desktop_apply_css_recursive(SPObject *o, SPCSSAttr *css, bool skip_lines)
 
         // Scale the style by the inverse of the accumulated parent transform in the paste context.
         {
-            NR::Matrix const local(sp_item_i2doc_affine(SP_ITEM(o)));
-            double const ex(NR::expansion(local));
+            Geom::Matrix const local(sp_item_i2doc_affine(SP_ITEM(o)));
+            double const ex(local.descrim());
             if ( ( ex != 0. )
                  && ( ex != 1. ) ) {
                 sp_css_attr_scale(css_set, 1/ex);
@@ -159,22 +159,22 @@ void
 sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write_current)
 {
     if (write_current) {
-// 1. Set internal value
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        // 1. Set internal value
         sp_repr_css_merge(desktop->current, css);
 
-// 1a. Write to prefs; make a copy and unset any URIs first
+        // 1a. Write to prefs; make a copy and unset any URIs first
         SPCSSAttr *css_write = sp_repr_css_attr_new();
         sp_repr_css_merge(css_write, css);
         sp_css_attr_unset_uris(css_write);
-        sp_repr_css_change(inkscape_get_repr(INKSCAPE, "desktop"), css_write, "style");
+        prefs->mergeStyle("/desktop/style", css_write);
+
         for (const GSList *i = desktop->selection->itemList(); i != NULL; i = i->next) {
             /* last used styles for 3D box faces are stored separately */
             if (SP_IS_BOX3D_SIDE (i->data)) {
                 const char * descr  = box3d_side_axes_string(SP_BOX3D_SIDE(i->data));
                 if (descr != NULL) {
-                    gchar *style_grp = g_strconcat ("desktop.", descr, NULL);
-                    sp_repr_css_change(inkscape_get_repr(INKSCAPE, style_grp), css_write, "style");
-                    g_free (style_grp);
+                    prefs->mergeStyle(Glib::ustring("/desktop/") + descr + "/style", css_write);
                 }
             }
         }
@@ -243,24 +243,22 @@ sp_desktop_get_color(SPDesktop *desktop, bool is_fill)
 }
 
 double
-sp_desktop_get_master_opacity_tool(SPDesktop *desktop, char const *tool, bool *has_opacity)
+sp_desktop_get_master_opacity_tool(SPDesktop *desktop, Glib::ustring const &tool, bool *has_opacity)
 {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     SPCSSAttr *css = NULL;
     gfloat value = 1.0; // default if nothing else found
     if (has_opacity)
         *has_opacity = false;
-    if (prefs_get_double_attribute(tool, "usecurrent", 0) != 0) {
+    if (prefs->getBool(tool + "/usecurrent")) {
         css = sp_desktop_get_style(desktop, true);
-    } else { 
-        Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool);
-        if (tool_repr) {
-            css = sp_repr_css_attr_inherited(tool_repr, "style");
-        }
+    } else {
+        css = prefs->getStyle(tool + "/style");
     }
-   
+
     if (css) {
         gchar const *property = css ? sp_repr_css_property(css, "opacity", "1.000") : 0;
-           
+
         if (desktop->current && property) { // if there is style and the property in it,
             if ( !sp_svg_number_read_f(property, &value) ) {
                 value = 1.0; // things failed. set back to the default
@@ -276,22 +274,20 @@ sp_desktop_get_master_opacity_tool(SPDesktop *desktop, char const *tool, bool *h
     return value;
 }
 double
-sp_desktop_get_opacity_tool(SPDesktop *desktop, char const *tool, bool is_fill)
+sp_desktop_get_opacity_tool(SPDesktop *desktop, Glib::ustring const &tool, bool is_fill)
 {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     SPCSSAttr *css = NULL;
     gfloat value = 1.0; // default if nothing else found
-    if (prefs_get_double_attribute(tool, "usecurrent", 0) != 0) {
+    if (prefs->getBool(tool + "/usecurrent")) {
         css = sp_desktop_get_style(desktop, true);
-    } else { 
-        Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool);
-        if (tool_repr) {
-            css = sp_repr_css_attr_inherited(tool_repr, "style");
-        }
+    } else {
+        css = prefs->getStyle(tool + "/style");
     }
-   
+
     if (css) {
         gchar const *property = css ? sp_repr_css_property(css, is_fill ? "fill-opacity": "stroke-opacity", "1.000") : 0;
-           
+
         if (desktop->current && property) { // if there is style and the property in it,
             if ( !sp_svg_number_read_f(property, &value) ) {
                 value = 1.0; // things failed. set back to the default
@@ -305,24 +301,22 @@ sp_desktop_get_opacity_tool(SPDesktop *desktop, char const *tool, bool is_fill)
 }
 
 guint32
-sp_desktop_get_color_tool(SPDesktop *desktop, char const *tool, bool is_fill, bool *has_color)
+sp_desktop_get_color_tool(SPDesktop *desktop, Glib::ustring const &tool, bool is_fill, bool *has_color)
 {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     SPCSSAttr *css = NULL;
     guint32 r = 0; // if there's no color, return black
     if (has_color)
         *has_color = false;
-    if (prefs_get_int_attribute(tool, "usecurrent", 0) != 0) {
+    if (prefs->getBool(tool + "/usecurrent")) {
         css = sp_desktop_get_style(desktop, true);
     } else {
-        Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool);
-        if (tool_repr) {
-            css = sp_repr_css_attr_inherited(tool_repr, "style");
-        }
+        css = prefs->getStyle(tool + "/style");
     }
-   
+
     if (css) {
         gchar const *property = sp_repr_css_property(css, is_fill ? "fill" : "stroke", "#000");
-           
+
         if (desktop->current && property) { // if there is style and the property in it,
             if (strncmp(property, "url", 3) && strncmp(property, "none", 4)) { // and if it's not url or none,
                 // read it
@@ -342,18 +336,17 @@ sp_desktop_get_color_tool(SPDesktop *desktop, char const *tool, bool is_fill, bo
  * Apply the desktop's current style or the tool style to repr.
  */
 void
-sp_desktop_apply_style_tool(SPDesktop *desktop, Inkscape::XML::Node *repr, char const *tool, bool with_text)
+sp_desktop_apply_style_tool(SPDesktop *desktop, Inkscape::XML::Node *repr, Glib::ustring const &tool_path, bool with_text)
 {
     SPCSSAttr *css_current = sp_desktop_get_style(desktop, with_text);
-    if ((prefs_get_int_attribute(tool, "usecurrent", 0) != 0) && css_current) {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
+    if (prefs->getBool(tool_path + "/usecurrent") && css_current) {
         sp_repr_css_set(repr, css_current, "style");
     } else {
-        Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool);
-        if (tool_repr) {
-            SPCSSAttr *css = sp_repr_css_attr_inherited(tool_repr, "style");
-            sp_repr_css_set(repr, css, "style");
-            sp_repr_css_attr_unref(css);
-        }
+        SPCSSAttr *css = prefs->getInheritedStyle(tool_path + "/style");
+        sp_repr_css_set(repr, css, "style");
+        sp_repr_css_attr_unref(css);
     }
     if (css_current) {
         sp_repr_css_attr_unref(css_current);
@@ -368,21 +361,19 @@ double
 sp_desktop_get_font_size_tool(SPDesktop *desktop)
 {
     (void)desktop; // TODO cleanup
-    gchar const *desktop_style = inkscape_get_repr(INKSCAPE, "desktop")->attribute("style");
-    gchar const *style_str = NULL;
-    if ((prefs_get_int_attribute("tools.text", "usecurrent", 0) != 0) && desktop_style) {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    Glib::ustring desktop_style = prefs->getString("/desktop/style");
+    Glib::ustring style_str;
+    if ((prefs->getBool("/tools/text/usecurrent")) && !desktop_style.empty()) {
         style_str = desktop_style;
     } else {
-        Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, "tools.text");
-        if (tool_repr) {
-            style_str = tool_repr->attribute("style");
-        }
+        style_str = prefs->getString("/tools/text/style");
     }
 
     double ret = 12;
-    if (style_str) {
+    if (!style_str.empty()) {
         SPStyle *style = sp_style_new(SP_ACTIVE_DOCUMENT);
-        sp_style_merge_from_style_string(style, style_str);
+        sp_style_merge_from_style_string(style, style_str.data());
         ret = style->font_size.computed;
         sp_style_unref(style);
     }
@@ -405,7 +396,7 @@ stroke_average_width (GSList const *objects)
         if (!SP_IS_ITEM (l->data))
             continue;
 
-        NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(l->data));
+        Geom::Matrix i2d = sp_item_i2d_affine (SP_ITEM(l->data));
 
         SPObject *object = SP_OBJECT(l->data);
 
@@ -416,7 +407,7 @@ stroke_average_width (GSList const *objects)
             notstroked = false;
         }
 
-        avgwidth += SP_OBJECT_STYLE (object)->stroke_width.computed * NR::expansion(i2d);
+        avgwidth += SP_OBJECT_STYLE (object)->stroke_width.computed * i2d.descrim();
     }
 
     if (notstroked)
@@ -656,6 +647,7 @@ objects_query_strokewidth (GSList *objects, SPStyle *style_res)
 
     gdouble prev_sw = -1;
     bool same_sw = true;
+    bool noneSet = true; // is stroke set to none?
 
     int n_stroked = 0;
 
@@ -665,14 +657,21 @@ objects_query_strokewidth (GSList *objects, SPStyle *style_res)
         SPStyle *style = SP_OBJECT_STYLE (obj);
         if (!style) continue;
 
-        if ( style->stroke.isNone() ) {
+        if ( style->stroke.isNone() && !(
+				style->marker[SP_MARKER_LOC].set || // stroke width affects markers, so if there's no stroke but only markers then we should
+				style->marker[SP_MARKER_LOC_START].set || // still calculate the stroke width
+				style->marker[SP_MARKER_LOC_MID].set ||
+				style->marker[SP_MARKER_LOC_END].set))
+		{
             continue;
         }
 
         n_stroked ++;
 
-        NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));
-        double sw = style->stroke_width.computed * NR::expansion(i2d);
+        noneSet &= style->stroke.isNone();
+
+        Geom::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));
+        double sw = style->stroke_width.computed * i2d.descrim();
 
         if (prev_sw != -1 && fabs(sw - prev_sw) > 1e-3)
             same_sw = false;
@@ -686,6 +685,7 @@ objects_query_strokewidth (GSList *objects, SPStyle *style_res)
 
     style_res->stroke_width.computed = avgwidth;
     style_res->stroke_width.set = true;
+    style_res->stroke.noneSet = noneSet; // Will only be true if none of the selected objects has it's stroke set.
 
     if (n_stroked == 0) {
         return QUERY_STYLE_NOTHING;
@@ -887,7 +887,7 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res)
         if (!style) continue;
 
         texts ++;
-        size += style->font_size.computed * NR::expansion(sp_item_i2d_affine(SP_ITEM(obj))); /// \todo FIXME: we assume non-% units here
+        size += style->font_size.computed * Geom::Matrix(sp_item_i2d_affine(SP_ITEM(obj))).descrim(); /// \todo FIXME: we assume non-% units here
 
         if (style->letter_spacing.normal) {
             if (!different && (letterspacing_prev == 0 || letterspacing_prev == letterspacing))
@@ -1089,19 +1089,19 @@ objects_query_fontspecification (GSList *objects, SPStyle *style_res)
 
         texts ++;
 
-        if (style_res->text->font_specification.value && style_res->text->font_specification.set &&   
+        if (style_res->text->font_specification.value && style_res->text->font_specification.set &&
             style->text->font_specification.value && style->text->font_specification.set &&
             strcmp (style_res->text->font_specification.value, style->text->font_specification.value)) {
             different = true;  // different fonts
         }
-        
+
         if (style->text->font_specification.set) {
 
             if (style_res->text->font_specification.value) {
                 g_free(style_res->text->font_specification.value);
                 style_res->text->font_specification.value = NULL;
             }
-    
+
             style_res->text->font_specification.set = TRUE;
             style_res->text->font_specification.value = g_strdup(style->text->font_specification.value);
         }
@@ -1130,7 +1130,7 @@ objects_query_blend (GSList *objects, SPStyle *style_res)
     float blend_prev = empty_prev;
     bool same_blend = true;
     guint items = 0;
-    
+
     for (GSList const *i = objects; i != NULL; i = i->next) {
         SPObject *obj = SP_OBJECT (i->data);
         SPStyle *style = SP_OBJECT_STYLE (obj);
@@ -1215,14 +1215,14 @@ objects_query_blur (GSList *objects, SPStyle *style_res)
     bool same_blur = true;
     guint blur_items = 0;
     guint items = 0;
-    
+
     for (GSList const *i = objects; i != NULL; i = i->next) {
         SPObject *obj = SP_OBJECT (i->data);
         SPStyle *style = SP_OBJECT_STYLE (obj);
         if (!style) continue;
         if (!SP_IS_ITEM(obj)) continue;
 
-        NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));
+        Geom::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));
 
         items ++;
 
@@ -1233,12 +1233,12 @@ objects_query_blur (GSList *objects, SPStyle *style_res)
             while (primitive_obj) {
                 if (SP_IS_FILTER_PRIMITIVE(primitive_obj)) {
                     SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(primitive_obj);
-                    
+
                     //if primitive is gaussianblur
                     if(SP_IS_GAUSSIANBLUR(primitive)) {
                         SPGaussianBlur * spblur = SP_GAUSSIANBLUR(primitive);
                         float num = spblur->stdDeviation.getNumber();
-                        blur_sum += num * NR::expansion(i2d);
+                        blur_sum += num * i2d.descrim();
                         if (blur_prev != -1 && fabs (num - blur_prev) > 1e-2) // rather low tolerance because difference in blur radii is much harder to notice than e.g. difference in sizes
                             same_blur = false;
                         blur_prev = num;
@@ -1292,7 +1292,7 @@ sp_desktop_query_style_from_list (GSList *list, SPStyle *style, int property)
 
     } else if (property == QUERY_STYLE_PROPERTY_MASTEROPACITY) {
         return objects_query_opacity (list, style);
-        
+
     } else if (property == QUERY_STYLE_PROPERTY_FONT_SPECIFICATION) {
         return objects_query_fontspecification (list, style);
     } else if (property == QUERY_STYLE_PROPERTY_FONTFAMILY) {
@@ -1324,11 +1324,15 @@ sp_desktop_query_style(SPDesktop *desktop, SPStyle *style, int property)
         return ret; // subselection returned a style, pass it on
 
     // otherwise, do querying and averaging over selection
-    return sp_desktop_query_style_from_list ((GSList *) desktop->selection->itemList(), style, property);
+    if (desktop->selection != NULL) {
+    	return sp_desktop_query_style_from_list ((GSList *) desktop->selection->itemList(), style, property);
+    }
+
+    return QUERY_STYLE_NOTHING;
 }
 
 /**
- * Do the same as sp_desktop_query_style for all (defined) style properties, return true if at 
+ * Do the same as sp_desktop_query_style for all (defined) style properties, return true if at
  * least one of the properties did not return QUERY_STYLE_NOTHING.
  */
 bool
@@ -1345,14 +1349,14 @@ sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query)
         int result_strokejoin = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_STROKEJOIN);
         int result_opacity = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_MASTEROPACITY);
         int result_blur = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_BLUR);
-        
-        return (result_family != QUERY_STYLE_NOTHING || 
-                result_fstyle != QUERY_STYLE_NOTHING || 
-                result_fnumbers != QUERY_STYLE_NOTHING || 
-                result_fill != QUERY_STYLE_NOTHING || 
-                result_stroke != QUERY_STYLE_NOTHING || 
-                result_opacity != QUERY_STYLE_NOTHING || 
-                result_strokewidth != QUERY_STYLE_NOTHING || 
+
+        return (result_family != QUERY_STYLE_NOTHING ||
+                result_fstyle != QUERY_STYLE_NOTHING ||
+                result_fnumbers != QUERY_STYLE_NOTHING ||
+                result_fill != QUERY_STYLE_NOTHING ||
+                result_stroke != QUERY_STYLE_NOTHING ||
+                result_opacity != QUERY_STYLE_NOTHING ||
+                result_strokewidth != QUERY_STYLE_NOTHING ||
                 result_strokemiterlimit != QUERY_STYLE_NOTHING ||
                 result_strokecap != QUERY_STYLE_NOTHING ||
                 result_strokejoin != QUERY_STYLE_NOTHING ||