diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 07817529dfaa25bc8ea29f211166fb655be0c337..2afcd610958061c993ea5ee53304a946cadd41ba 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
#include "style.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"
#include "desktop-style.h"
#include "svg/svg-icc-color.h"
+#include "svg/svg-device-color.h"
#include "box3d-side.h"
/**
@@ -168,7 +169,7 @@ sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write
sp_repr_css_merge(css_write, css);
sp_css_attr_unset_uris(css_write);
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)) {
@@ -255,10 +256,10 @@ sp_desktop_get_master_opacity_tool(SPDesktop *desktop, Glib::ustring const &tool
} 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
@@ -281,13 +282,13 @@ sp_desktop_get_opacity_tool(SPDesktop *desktop, Glib::ustring const &tool, bool
gfloat value = 1.0; // default if nothing else found
if (prefs->getBool(tool + "/usecurrent")) {
css = sp_desktop_get_style(desktop, true);
- } else {
+ } 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
guint32
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
@@ -313,10 +314,10 @@ sp_desktop_get_color_tool(SPDesktop *desktop, Glib::ustring const &tool, bool is
} else {
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
@@ -340,11 +341,11 @@ sp_desktop_apply_style_tool(SPDesktop *desktop, Inkscape::XML::Node *repr, Glib:
{
SPCSSAttr *css_current = sp_desktop_get_style(desktop, with_text);
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-
+
if (prefs->getBool(tool_path + "/usecurrent") && css_current) {
sp_repr_css_set(repr, css_current, "style");
} else {
- SPCSSAttr *css = prefs->getStyle(tool_path + "/style");
+ SPCSSAttr *css = prefs->getInheritedStyle(tool_path + "/style");
sp_repr_css_set(repr, css, "style");
sp_repr_css_attr_unref(css);
}
@@ -432,6 +433,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
paint_res->set = TRUE;
SVGICCColor* iccColor = 0;
+ SVGDeviceColor* devColor = 0;
+
bool iccSeen = false;
gfloat c[4];
c[0] = c[1] = c[2] = c[3] = 0.0;
@@ -529,6 +532,23 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
c[1] += d[1];
c[2] += d[2];
c[3] += SP_SCALE24_TO_FLOAT (isfill? style->fill_opacity.value : style->stroke_opacity.value);
+
+ // average device color
+ unsigned int it;
+ if (i==objects /*if this is the first object in the GList*/
+ && paint->value.color.device){
+ devColor = new SVGDeviceColor(*paint->value.color.device);
+ for (it=0; it < paint->value.color.device->colors.size(); it++){
+ devColor->colors[it] = 0;
+ }
+ }
+
+ if (devColor && paint->value.color.device && paint->value.color.device->type == devColor->type){
+ for (it=0; it < paint->value.color.device->colors.size(); it++){
+ devColor->colors[it] += paint->value.color.device->colors[it];
+ }
+ }
+
num ++;
}
@@ -568,6 +588,14 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
paint_res->value.color.icc = tmp;
}
+ // divide and store the device-color
+ if (devColor){
+ for (unsigned int it=0; it < devColor->colors.size(); it++){
+ devColor->colors[it] /= num;
+ }
+ paint_res->value.color.device = devColor;
+ }
+
if (num > 1) {
if (same_color)
return QUERY_STYLE_MULTIPLE_SAME;
gdouble prev_sw = -1;
bool same_sw = true;
+ bool noneSet = true; // is stroke set to none?
int n_stroked = 0;
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 ++;
+ noneSet &= style->stroke.isNone();
+
Geom::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));
double sw = style->stroke_width.computed * i2d.descrim();
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;
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);
}
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);
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);
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);
} 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) {
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
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 ||