diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index c92bcfdf5ca2366d9c66e51f45fff3ab893d4114..5615a8ea96d1cca3b259d2999b0cff14ac2dbe62 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
#include "xml/repr.h"
#include "libnrtype/font-style-to-pos.h"
#include "sp-path.h"
+#include "event-context.h"
#include "desktop-style.h"
#include "svg/svg-icc-color.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)) {
@@ -195,10 +196,33 @@ sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write
// 3. If nobody has intercepted the signal, apply the style to the selection
if (!intercepted) {
+ // If we have an event context, update its cursor (TODO: it could be neater to do this with the signal sent above, but what if the signal gets intercepted?)
+ if (desktop->event_context) {
+ sp_event_context_update_cursor(desktop->event_context);
+ }
+
+ // Remove text attributes if not text...
+ // Do this once in case a zillion objects are selected.
+ SPCSSAttr *css_no_text = sp_repr_css_attr_new();
+ sp_repr_css_merge(css_no_text, css);
+ css_no_text = sp_css_attr_unset_text(css_no_text);
+
for (GSList const *i = desktop->selection->itemList(); i != NULL; i = i->next) {
- /// \todo if the style is text-only, apply only to texts?
- sp_desktop_apply_css_recursive(SP_OBJECT(i->data), css, true);
+
+ // If not text, don't apply text attributes (can a group have text attributes?)
+ if ( SP_IS_TEXT(i->data) || SP_IS_FLOWTEXT(i->data)
+ || SP_IS_TSPAN(i->data) || SP_IS_TREF(i->data) || SP_IS_TEXTPATH(i->data)
+ || SP_IS_FLOWDIV(i->data) || SP_IS_FLOWPARA(i->data) || SP_IS_FLOWTSPAN(i->data)) {
+
+ sp_desktop_apply_css_recursive(SP_OBJECT(i->data), css, true);
+
+ } else {
+
+ sp_desktop_apply_css_recursive(SP_OBJECT(i->data), css_no_text, true);
+
+ }
}
+ sp_repr_css_attr_unref(css_no_text);
}
}
@@ -255,10 +279,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 +305,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 +337,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 +364,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);
}
return avgwidth / (g_slist_length ((GSList *) objects) - n_notstroked);
}
+static bool vectorsClose( std::vector<double> const &lhs, std::vector<double> const &rhs )
+{
+ static double epsilon = 1e-6;
+ bool isClose = false;
+ if ( lhs.size() == rhs.size() ) {
+ isClose = true;
+ for ( size_t i = 0; (i < lhs.size()) && isClose; ++i ) {
+ isClose = fabs(lhs[i] - rhs[i]) < epsilon;
+ }
+ }
+ return isClose;
+}
+
+
/**
* Write to style_res the average fill or stroke of list of objects, if applicable.
*/
@@ -432,6 +470,7 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
paint_res->set = TRUE;
SVGICCColor* iccColor = 0;
+
bool iccSeen = false;
gfloat c[4];
c[0] = c[1] = c[2] = c[3] = 0.0;
@@ -472,8 +511,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
if (!SP_IS_LINEARGRADIENT(server))
return QUERY_STYLE_MULTIPLE_DIFFERENT; // different kind of server
- SPGradient *vector = sp_gradient_get_vector ( SP_GRADIENT (server), FALSE );
- SPGradient *vector_res = sp_gradient_get_vector ( SP_GRADIENT (server_res), FALSE );
+ SPGradient *vector = SP_GRADIENT(server)->getVector();
+ SPGradient *vector_res = SP_GRADIENT(server_res)->getVector();
if (vector_res != vector)
return QUERY_STYLE_MULTIPLE_DIFFERENT; // different gradient vectors
@@ -482,8 +521,8 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
if (!SP_IS_RADIALGRADIENT(server))
return QUERY_STYLE_MULTIPLE_DIFFERENT; // different kind of server
- SPGradient *vector = sp_gradient_get_vector ( SP_GRADIENT (server), FALSE );
- SPGradient *vector_res = sp_gradient_get_vector ( SP_GRADIENT (server_res), FALSE );
+ SPGradient *vector = SP_GRADIENT(server)->getVector();
+ SPGradient *vector_res = SP_GRADIENT(server_res)->getVector();
if (vector_res != vector)
return QUERY_STYLE_MULTIPLE_DIFFERENT; // different gradient vectors
@@ -514,11 +553,15 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
iccColor = paint->value.color.icc;
iccSeen = true;
} else {
- if (same_color && (prev[0] != d[0] || prev[1] != d[1] || prev[2] != d[2]))
+ 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;
+ }
+ if ( iccSeen && iccColor ) {
+ if ( !paint->value.color.icc
+ || (iccColor->colorProfile != paint->value.color.icc->colorProfile)
+ || !vectorsClose(iccColor->colors, paint->value.color.icc->colors) ) {
+ same_color = false;
iccColor = 0;
}
}
@@ -529,6 +572,7 @@ 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);
+
num ++;
}
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;
double size = 0;
double letterspacing = 0;
+ double wordspacing = 0;
double linespacing = 0;
- bool linespacing_normal = false;
bool letterspacing_normal = false;
+ bool wordspacing_normal = false;
+ bool linespacing_normal = false;
double size_prev = 0;
double letterspacing_prev = 0;
+ double wordspacing_prev = 0;
double linespacing_prev = 0;
- /// \todo FIXME: add word spacing, kerns? rotates?
-
int texts = 0;
for (GSList const *i = objects; i != NULL; i = i->next) {
letterspacing_normal = false;
}
+ if (style->word_spacing.normal) {
+ if (!different && (wordspacing_prev == 0 || wordspacing_prev == wordspacing))
+ wordspacing_normal = true;
+ } else {
+ wordspacing += style->word_spacing.computed; /// \todo FIXME: we assume non-% units here
+ wordspacing_normal = false;
+ }
+
double linespacing_current;
if (style->line_height.normal) {
linespacing_current = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL;
if ((size_prev != 0 && style->font_size.computed != size_prev) ||
(letterspacing_prev != 0 && style->letter_spacing.computed != letterspacing_prev) ||
+ (wordspacing_prev != 0 && style->word_spacing.computed != wordspacing_prev) ||
(linespacing_prev != 0 && linespacing_current != linespacing_prev)) {
different = true;
}
size_prev = style->font_size.computed;
letterspacing_prev = style->letter_spacing.computed;
+ wordspacing_prev = style->word_spacing.computed;
linespacing_prev = linespacing_current;
// FIXME: we must detect MULTIPLE_DIFFERENT for these too
if (texts > 1) {
size /= texts;
letterspacing /= texts;
+ wordspacing /= texts;
linespacing /= texts;
}
style_res->letter_spacing.normal = letterspacing_normal;
style_res->letter_spacing.computed = letterspacing;
+ style_res->word_spacing.normal = wordspacing_normal;
+ style_res->word_spacing.computed = wordspacing;
+
style_res->line_height.normal = linespacing_normal;
style_res->line_height.computed = linespacing;
style_res->line_height.value = linespacing;
}
}
+/**
+ * Write to style_res the baseline numbers.
+ */
+int
+objects_query_baselines (GSList *objects, SPStyle *style_res)
+{
+ bool different = false;
+
+ // Only baseline-shift at the moment
+ // We will return:
+ // If baseline-shift is same for all objects:
+ // The full baseline-shift data (used for subscripts and superscripts)
+ // If baseline-shift is different:
+ // The average baseline-shift (not implemented at the moment as this is complicated June 2010)
+ SPIBaselineShift old;
+ old.value = 0.0;
+ old.computed = 0.0;
+
+ // double baselineshift = 0.0;
+ bool set = false;
+
+ int texts = 0;
+
+ 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 ++;
+
+ SPIBaselineShift current;
+ if(style->baseline_shift.set) {
+
+ current.set = style->baseline_shift.set;
+ current.inherit = style->baseline_shift.inherit;
+ current.type = style->baseline_shift.type;
+ current.literal = style->baseline_shift.literal;
+ current.value = style->baseline_shift.value;
+ current.computed = style->baseline_shift.computed;
+
+ if( set ) {
+ if( current.set != old.set ||
+ current.inherit != old.inherit ||
+ current.type != old.type ||
+ current.literal != old.literal ||
+ current.value != old.value ||
+ current.computed != old.computed ) {
+ // Maybe this needs to be better thought out.
+ different = true;
+ }
+ }
+
+ set = true;
+
+ old.set = current.set;
+ old.inherit = current.inherit;
+ old.type = current.type;
+ old.literal = current.literal;
+ old.value = current.value;
+ old.computed = current.computed;
+ }
+ }
+
+ if (different || !set ) {
+ style_res->baseline_shift.set = false;
+ style_res->baseline_shift.computed = 0.0;
+ } else {
+ style_res->baseline_shift.set = old.set;
+ style_res->baseline_shift.inherit = old.inherit;
+ style_res->baseline_shift.type = old.type;
+ style_res->baseline_shift.literal = old.literal;
+ style_res->baseline_shift.value = old.value;
+ style_res->baseline_shift.computed = old.computed;
+ }
+
+ if (texts == 0 || !set)
+ 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;
+ }
+}
+
/**
* Write to style_res the average font family of objects.
*/
for (GSList const *i = objects; i != NULL; i = i->next) {
SPObject *obj = SP_OBJECT (i->data);
+ // std::cout << " " << SP_OBJECT_ID (i->data) << std::endl;
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))
for (GSList const *i = objects; i != NULL; i = i->next) {
SPObject *obj = SP_OBJECT (i->data);
+ // std::cout << " " << SP_OBJECT_ID (i->data) << std::endl;
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))
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 objects_query_fontstyle (list, style);
} else if (property == QUERY_STYLE_PROPERTY_FONTNUMBERS) {
return objects_query_fontnumbers (list, style);
+ } else if (property == QUERY_STYLE_PROPERTY_BASELINES) {
+ return objects_query_baselines (list, style);
} else if (property == QUERY_STYLE_PROPERTY_BLEND) {
return objects_query_blend (list, style);
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 ||