![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index a68c99d65c887ed3e095a9876e15eceaaa88e019..3504dcf4070ffc0284816547751a8dda5e1c8a2c 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
* Released under GNU GPL, read the file 'COPYING' for more information
*/
+#include <string>
+#include <cstring>
+
#include "desktop.h"
#include "color-rgba.h"
#include "svg/css-ostringstream.h"
#include "sp-path.h"
#include "desktop-style.h"
+#include "svg/svg-icc-color.h"
+#include "box3d-side.h"
/**
* Set color on selection on desktop.
guint32 rgba = SP_RGBA32_F_COMPOSE(color[0], color[1], color[2], color[3]);
gchar b[64];
- sp_svg_write_color(b, 64, rgba);
+ sp_svg_write_color(b, sizeof(b), rgba);
SPCSSAttr *css = sp_repr_css_attr_new();
if (fill) {
sp_repr_css_set_property(css, "fill", b);
@@ -164,8 +169,8 @@ sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write
sp_repr_css_change(inkscape_get_repr(INKSCAPE, "desktop"), css_write, "style");
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_PATH (i->data)) {
- const char * descr = SP_OBJECT_REPR (G_OBJECT (i->data))->attribute ("inkscape:box3dface");
+ 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");
notstroked = false;
}
- avgwidth += SP_OBJECT_STYLE (object)->stroke_width.computed * i2d.expansion();
+ avgwidth += SP_OBJECT_STYLE (object)->stroke_width.computed * NR::expansion(i2d);
}
if (notstroked)
@@ -424,6 +429,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
bool paintImpossible = true;
paint_res->set = TRUE;
+ SVGICCColor* iccColor = 0;
+ bool iccSeen = false;
gfloat c[4];
c[0] = c[1] = c[2] = c[3] = 0.0;
gint num = 0;
@@ -502,9 +509,17 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
prev[1] = d[1];
prev[2] = d[2];
paint_res->setColor(d[0], d[1], d[2]);
+ iccColor = paint->value.color.icc;
+ iccSeen = true;
} else {
if (same_color && (prev[0] != d[0] || prev[1] != d[1] || prev[2] != d[2]))
same_color = false;
+ if ( iccSeen ) {
+ if(paint->value.color.icc) {
+ // TODO fix this
+ iccColor = 0;
+ }
+ }
}
// average color
@@ -515,7 +530,9 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
num ++;
}
- paintImpossible = false;
+ paintImpossible = false;
+ paint_res->colorSet = paint->colorSet;
+ paint_res->currentcolor = paint->currentcolor;
if (paint_res->set && paint_effectively_set && paint->isPaintserver()) { // copy the server
if (isfill) {
sp_style_set_to_uri_string (style_res, true, style->getFillURI());
@@ -541,6 +558,14 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
} else {
style_res->stroke_opacity.value = SP_SCALE24_FROM_FLOAT (c[3]);
}
+
+
+ if ( iccSeen && iccColor ) {
+ // TODO check for existing
+ SVGICCColor* tmp = new SVGICCColor(*iccColor);
+ paint_res->value.color.icc = tmp;
+ }
+
if (num > 1) {
if (same_color)
return QUERY_STYLE_MULTIPLE_SAME;
n_stroked ++;
NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj));
- double sw = style->stroke_width.computed * i2d.expansion();
+ double sw = style->stroke_width.computed * NR::expansion(i2d);
if (prev_sw != -1 && fabs(sw - prev_sw) > 1e-3)
same_sw = false;
}
}
+int
+objects_query_fontspecification (GSList *objects, SPStyle *style_res)
+{
+ bool different = false;
+ int texts = 0;
+
+ 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 = FALSE;
+
+ for (GSList const *i = objects; i != NULL; i = i->next) {
+ SPObject *obj = SP_OBJECT (i->data);
+
+ if (!SP_IS_TEXT(obj) && !SP_IS_FLOWTEXT(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;
+
+ SPStyle *style = SP_OBJECT_STYLE (obj);
+ if (!style) continue;
+
+ texts ++;
+
+ 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);
+ }
+ }
+
+ if (texts == 0)
+ return QUERY_STYLE_NOTHING;
+
+ if (texts > 1) {
+ if (different) {
+ return QUERY_STYLE_MULTIPLE_DIFFERENT;
+ } else {
+ return QUERY_STYLE_MULTIPLE_SAME;
+ }
+ } else {
+ return QUERY_STYLE_SINGLE;
+ }
+}
+
int
objects_query_blend (GSList *objects, SPStyle *style_res)
{
} 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 objects_query_fontfamily (list, style);
} else if (property == QUERY_STYLE_PROPERTY_FONTSTYLE) {
}
/**
- * Do the same as sp_desktop_query_style for all (defined) style properties, return true if none of
- * the properties returned QUERY_STYLE_NOTHING.
+ * 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
sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query)
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 && result_strokemiterlimit != QUERY_STYLE_NOTHING && result_strokecap != QUERY_STYLE_NOTHING && result_strokejoin != QUERY_STYLE_NOTHING && result_blur != 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 ||
+ result_blur != QUERY_STYLE_NOTHING);
}