![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 789bcf4d0e5121a1d928a6ebbefff7fe32cc087c..a6a4d8567518399c31f87e2c39d42e9d67ed4792 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
#include "svg/svg.h"
#include "svg/svg-color.h"
#include "selection.h"
-#include "sp-tspan.h"
-#include "sp-textpath.h"
#include "inkscape.h"
#include "style.h"
#include "prefs-utils.h"
#include "sp-use.h"
+#include "sp-feblend.h"
#include "sp-filter.h"
+#include "sp-filter-reference.h"
#include "sp-gaussian-blur.h"
#include "sp-flowtext.h"
#include "sp-flowregion.h"
#include "sp-flowdiv.h"
#include "sp-linear-gradient.h"
-#include "sp-radial-gradient.h"
#include "sp-pattern.h"
+#include "sp-radial-gradient.h"
+#include "sp-textpath.h"
+#include "sp-tref.h"
+#include "sp-tspan.h"
#include "xml/repr.h"
#include "libnrtype/font-style-to-pos.h"
-
#include "desktop-style.h"
/**
double ret = 12;
if (style_str) {
- SPStyle *style = sp_style_new();
+ SPStyle *style = sp_style_new(SP_ACTIVE_DOCUMENT);
sp_style_merge_from_style_string(style, style_str);
ret = style->font_size.computed;
sp_style_unref(style);
@@ -426,7 +428,10 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
// We consider paint "effectively set" for anything within text hierarchy
SPObject *parent = SP_OBJECT_PARENT (obj);
- bool paint_effectively_set = paint->set || (SP_IS_TEXT(parent) || SP_IS_TEXTPATH(parent) || SP_IS_TSPAN(parent) || SP_IS_FLOWTEXT(parent) || SP_IS_FLOWDIV(parent) || SP_IS_FLOWPARA(parent) || SP_IS_FLOWTSPAN(parent) || SP_IS_FLOWLINE(parent));
+ bool paint_effectively_set =
+ paint->set || (SP_IS_TEXT(parent) || SP_IS_TEXTPATH(parent) || SP_IS_TSPAN(parent)
+ || SP_IS_FLOWTEXT(parent) || SP_IS_FLOWDIV(parent) || SP_IS_FLOWPARA(parent)
+ || SP_IS_FLOWTSPAN(parent) || SP_IS_FLOWLINE(parent));
// 1. Bail out with QUERY_STYLE_MULTIPLE_DIFFERENT if necessary
@@ -497,14 +502,14 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
num ++;
}
+ paint_res->type = paint->type;
if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_PAINTSERVER) { // copy the server
if (isfill) {
- SP_STYLE_FILL_SERVER (style_res) = SP_STYLE_FILL_SERVER (style);
+ sp_style_set_to_uri_string (style_res, true, style->getFillURI());
} else {
- SP_STYLE_STROKE_SERVER (style_res) = SP_STYLE_STROKE_SERVER (style);
+ sp_style_set_to_uri_string (style_res, false, style->getStrokeURI());
}
}
- paint_res->type = paint->type;
paint_res->set = paint_effectively_set;
style_res->fill_rule.computed = style->fill_rule.computed; // no averaging on this, just use the last one
}
SPObject *obj = SP_OBJECT (i->data);
if (!SP_IS_TEXT(obj) && !SP_IS_FLOWTEXT(obj)
- && !SP_IS_TSPAN(obj) && !SP_IS_TEXTPATH(obj)
+ && !SP_IS_TSPAN(obj) && !SP_IS_TREF(obj) && !SP_IS_TEXTPATH(obj)
&& !SP_IS_FLOWDIV(obj) && !SP_IS_FLOWPARA(obj) && !SP_IS_FLOWTSPAN(obj))
continue;
SPObject *obj = SP_OBJECT (i->data);
if (!SP_IS_TEXT(obj) && !SP_IS_FLOWTEXT(obj)
- && !SP_IS_TSPAN(obj) && !SP_IS_TEXTPATH(obj)
+ && !SP_IS_TSPAN(obj) && !SP_IS_TREF(obj) && !SP_IS_TEXTPATH(obj)
&& !SP_IS_FLOWDIV(obj) && !SP_IS_FLOWPARA(obj) && !SP_IS_FLOWTSPAN(obj))
continue;
SPObject *obj = SP_OBJECT (i->data);
if (!SP_IS_TEXT(obj) && !SP_IS_FLOWTEXT(obj)
- && !SP_IS_TSPAN(obj) && !SP_IS_TEXTPATH(obj)
+ && !SP_IS_TSPAN(obj) && !SP_IS_TREF(obj) && !SP_IS_TEXTPATH(obj)
&& !SP_IS_FLOWDIV(obj) && !SP_IS_FLOWPARA(obj) && !SP_IS_FLOWTSPAN(obj))
continue;
}
}
+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->getFilter()) {
+ int blurcount = 0;
+ int blendcount = 0;
+
+ // determine whether filter is simple (blend and/or blur) or complex
+ for(SPObject *primitive_obj = style->getFilter()->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->getFilter()->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.
*/
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) {
+ if (style->filter.set && style->getFilter()) {
//cycle through filter primitives
- for(int i=0; i<style->filter.filter->_primitive_count; i++)
- {
- SPFilterPrimitive *primitive = style->filter.filter->_primitives[i];
- //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 ++;
+ SPObject *primitive_obj = style->getFilter()->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) {
} 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);
}