![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index cf8f67442d59941d824090486ee57d7e41af7b75..5685dc4d6502208c853848a1e6dbff5d5b1c525f 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
#include "style.h"
#include "prefs-utils.h"
#include "sp-use.h"
+#include "sp-feblend.h"
+#include "sp-filter.h"
+#include "sp-gaussian-blur.h"
#include "sp-flowtext.h"
#include "sp-flowregion.h"
#include "sp-flowdiv.h"
}
double
-sp_desktop_get_opacity_tool(SPDesktop *desktop, char const *tool)
+sp_desktop_get_master_opacity_tool(SPDesktop *desktop, char const *tool)
{
SPCSSAttr *css = NULL;
gfloat value = 1.0; // default if nothing else found
css = sp_desktop_get_style(desktop, true);
} else {
Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool);
- css = sp_repr_css_attr_inherited(tool_repr, "style");
+ if (tool_repr) {
+ css = sp_repr_css_attr_inherited(tool_repr, "style");
+ }
}
- gchar const *property = css ? sp_repr_css_property(css, "opacity", "1.000") : 0;
+ 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
+ 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
+ }
}
+
+ sp_repr_css_attr_unref(css);
}
+ return value;
+}
+double
+sp_desktop_get_opacity_tool(SPDesktop *desktop, char const *tool, bool is_fill)
+{
+ SPCSSAttr *css = NULL;
+ gfloat value = 1.0; // default if nothing else found
+ if (prefs_get_double_attribute(tool, "usecurrent", 0) != 0) {
+ 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");
+ }
+ }
+
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
+ }
+ }
+
sp_repr_css_attr_unref(css);
}
css = sp_desktop_get_style(desktop, true);
} else {
Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool);
- css = sp_repr_css_attr_inherited(tool_repr, "style");
+ if (tool_repr) {
+ css = sp_repr_css_attr_inherited(tool_repr, "style");
+ }
}
- gchar const *property = sp_repr_css_property(css, is_fill ? "fill" : "stroke", "#000");
+ 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)) { // and if it's not url,
- // read it
- r = sp_svg_read_color(property, r);
+ if (desktop->current && property) { // if there is style and the property in it,
+ if (strncmp(property, "url", 3)) { // and if it's not url,
+ // read it
+ r = sp_svg_read_color(property, r);
+ }
}
- }
- if (css) {
sp_repr_css_attr_unref(css);
}
@@ -379,8 +414,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
c[0] = c[1] = c[2] = c[3] = 0.0;
gint num = 0;
- gfloat prev[4];
- prev[0] = prev[1] = prev[2] = prev[3] = 0.0;
+ gfloat prev[3];
+ prev[0] = prev[1] = prev[2] = 0.0;
bool same_color = true;
for (GSList const *i = objects; i != NULL; i = i->next) {
@@ -450,9 +485,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
prev[0] = d[0];
prev[1] = d[1];
prev[2] = d[2];
- prev[3] = d[3];
} else {
- if (same_color && (prev[0] != d[0] || prev[1] != d[1] || prev[2] != d[2] || prev[3] != d[3]))
+ if (same_color && (prev[0] != d[0] || prev[1] != d[1] || prev[2] != d[2]))
same_color = false;
}
style_res->font_style.value = style_res->font_style.computed = style->font_style.computed;
style_res->font_stretch.value = style_res->font_stretch.computed = style->font_stretch.computed;
style_res->font_variant.value = style_res->font_variant.computed = style->font_variant.computed;
+ style_res->text_align.value = style_res->text_align.computed = style->text_align.computed;
}
if (texts == 0 || !set)
}
}
+int
+objects_query_blend (GSList *objects, SPStyle *style_res)
+{
+ const int empty_prev = -2;
+ const int complex_filter = 5;
+ int blend = 0;
+ 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);
+ if(!style || !SP_IS_ITEM(obj)) continue;
+
+ items++;
+
+ //if object has a filter
+ if (style->filter.set && style->filter.filter) {
+ int blurcount = 0;
+ int blendcount = 0;
+
+ // determine whether filter is simple (blend and/or blur) or complex
+ for(SPObject *primitive_obj = style->filter.filter->children;
+ primitive_obj && SP_IS_FILTER_PRIMITIVE(primitive_obj);
+ primitive_obj = primitive_obj->next) {
+ SPFilterPrimitive *primitive = SP_FILTER_PRIMITIVE(primitive_obj);
+ if(SP_IS_FEBLEND(primitive))
+ ++blendcount;
+ else if(SP_IS_GAUSSIANBLUR(primitive))
+ ++blurcount;
+ else {
+ blurcount = complex_filter;
+ break;
+ }
+ }
+
+ // simple filter
+ if(blurcount == 1 || blendcount == 1) {
+ for(SPObject *primitive_obj = style->filter.filter->children;
+ primitive_obj && SP_IS_FILTER_PRIMITIVE(primitive_obj);
+ primitive_obj = primitive_obj->next) {
+ if(SP_IS_FEBLEND(primitive_obj)) {
+ SPFeBlend *spblend = SP_FEBLEND(primitive_obj);
+ blend = spblend->blend_mode;
+ }
+ }
+ }
+ else {
+ blend = complex_filter;
+ }
+ }
+ // defaults to blend mode = "normal"
+ else {
+ blend = 0;
+ }
+
+ if(blend_prev != empty_prev && blend_prev != blend)
+ same_blend = false;
+ blend_prev = blend;
+ }
+
+ if (items > 0) {
+ style_res->filter_blend_mode.value = blend;
+ }
+
+ if (items == 0) {
+ return QUERY_STYLE_NOTHING;
+ } else if (items == 1) {
+ return QUERY_STYLE_SINGLE;
+ } else {
+ if(same_blend)
+ return QUERY_STYLE_MULTIPLE_SAME;
+ else
+ return QUERY_STYLE_MULTIPLE_DIFFERENT;
+ }
+}
+
+/**
+ * Write to style_res the average blurring of a list of objects.
+ */
+int
+objects_query_blur (GSList *objects, SPStyle *style_res)
+{
+ if (g_slist_length(objects) == 0) {
+ /* No objects, set empty */
+ return QUERY_STYLE_NOTHING;
+ }
+
+ float blur_sum = 0;
+ float blur_prev = -1;
+ 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));
+
+ items ++;
+
+ //if object has a filter
+ if (style->filter.set && style->filter.filter) {
+ //cycle through filter primitives
+ SPObject *primitive_obj = style->filter.filter->children;
+ 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);
+ 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;
+ //TODO: deal with opt number, for the moment it's not necessary to the ui.
+ blur_items ++;
+ }
+ }
+ primitive_obj = primitive_obj->next;
+ }
+ }
+ }
+
+ if (items > 0) {
+ if (blur_items > 0)
+ blur_sum /= blur_items;
+ style_res->filter_gaussianBlur_deviation.value = blur_sum;
+ }
+
+ if (items == 0) {
+ return QUERY_STYLE_NOTHING;
+ } else if (items == 1) {
+ return QUERY_STYLE_SINGLE;
+ } else {
+ if (same_blur)
+ return QUERY_STYLE_MULTIPLE_SAME;
+ else
+ return QUERY_STYLE_MULTIPLE_AVERAGED;
+ }
+}
+
/**
* Query the given list of objects for the given property, write
* the result to style, return appropriate flag.
@@ -1006,8 +1189,12 @@ sp_desktop_query_style_from_list (GSList *list, SPStyle *style, int property)
return objects_query_fontstyle (list, style);
} else if (property == QUERY_STYLE_PROPERTY_FONTNUMBERS) {
return objects_query_fontnumbers (list, style);
- }
+ } else if (property == QUERY_STYLE_PROPERTY_BLEND) {
+ return objects_query_blend (list, style);
+ } else if (property == QUERY_STYLE_PROPERTY_BLUR) {
+ return objects_query_blur (list, style);
+ }
return QUERY_STYLE_NOTHING;
}
int result_strokecap = sp_desktop_query_style (desktop, query, QUERY_STYLE_PROPERTY_STROKECAP);
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);
-
- 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);
+ 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 && result_strokemiterlimit != QUERY_STYLE_NOTHING && result_strokecap != QUERY_STYLE_NOTHING && result_strokejoin != QUERY_STYLE_NOTHING && result_blur != QUERY_STYLE_NOTHING);
}