![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 94221ba546fb4eb0c2d42dddb5ac7fcbd8ee938b..236130173fec7f4536e6429f23c2f540ddcd920a 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-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 "sp-path.h"
#include "desktop-style.h"
+#include "svg/svg-icc-color.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);
@@ -161,6 +163,17 @@ 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);
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 (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);
+ }
+ }
+ }
sp_repr_css_attr_unref(css_write);
}
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) {
SPObject *object = SP_OBJECT(l->data);
- if ( object->style->stroke.type == SP_PAINT_TYPE_NONE ) {
+ if ( object->style->stroke.isNone() ) {
++n_notstroked; // do not count nonstroked objects
continue;
} else {
@@ -408,9 +422,11 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
}
SPIPaint *paint_res = isfill? &style_res->fill : &style_res->stroke;
- paint_res->type = SP_PAINT_TYPE_IMPOSSIBLE;
+ 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;
@@ -428,15 +444,18 @@ 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
- if ((paint_res->type != SP_PAINT_TYPE_IMPOSSIBLE) && (paint->type != paint_res->type || (paint_res->set != paint_effectively_set))) {
+ if ((!paintImpossible) && (!paint->isSameType(*paint_res) || (paint_res->set != paint_effectively_set))) {
return QUERY_STYLE_MULTIPLE_DIFFERENT; // different types of paint
}
- if (paint_res->set && paint->set && paint_res->type == SP_PAINT_TYPE_PAINTSERVER) {
+ if (paint_res->set && paint->set && paint_res->isPaintserver()) {
// both previous paint and this paint were a server, see if the servers are compatible
SPPaintServer *server_res = isfill? SP_STYLE_FILL_SERVER (style_res) : SP_STYLE_STROKE_SERVER (style_res);
@@ -476,19 +495,27 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
// 2. Sum color, copy server from paint to paint_res
- if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_COLOR) {
-
+ if (paint_res->set && paint_effectively_set && paint->isColor()) {
gfloat d[3];
sp_color_get_rgb_floatv (&paint->value.color, d);
// Check if this color is the same as previous
- if (paint_res->type == SP_PAINT_TYPE_IMPOSSIBLE) {
+ if (paintImpossible) {
prev[0] = d[0];
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
@@ -499,32 +526,42 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
num ++;
}
- if (paint_res->set && paint_effectively_set && paint->type == SP_PAINT_TYPE_PAINTSERVER) { // copy the server
+ 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_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
}
// After all objects processed, divide the color if necessary and return
- if (paint_res->set && paint_res->type == SP_PAINT_TYPE_COLOR) { // set the color
+ if (paint_res->set && paint_res->isColor()) { // set the color
g_assert (num >= 1);
c[0] /= num;
c[1] /= num;
c[2] /= num;
c[3] /= num;
- sp_color_set_rgb_float(&paint_res->value.color, c[0], c[1], c[2]);
+ paint_res->setColor(c[0], c[1], c[2]);
if (isfill) {
style_res->fill_opacity.value = SP_SCALE24_FROM_FLOAT (c[3]);
} 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;
SPStyle *style = SP_OBJECT_STYLE (obj);
if (!style) continue;
- if ( style->stroke.type == SP_PAINT_TYPE_NONE ) {
+ if ( style->stroke.isNone() ) {
continue;
}
SPStyle *style = SP_OBJECT_STYLE (obj);
if (!style) continue;
- if ( style->stroke.type == SP_PAINT_TYPE_NONE ) {
+ if ( style->stroke.isNone() ) {
continue;
}
SPStyle *style = SP_OBJECT_STYLE (obj);
if (!style) continue;
- if ( style->stroke.type == SP_PAINT_TYPE_NONE ) {
+ if ( style->stroke.isNone() ) {
continue;
}
SPStyle *style = SP_OBJECT_STYLE (obj);
if (!style) continue;
- if ( style->stroke.type == SP_PAINT_TYPE_NONE ) {
+ if ( style->stroke.isNone() ) {
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;
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;