X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fdesktop-style.cpp;h=c580d6767636a641c2036e2dd62600fe1b081af9;hb=941ff7c62ac6b94d08e349025428ca1b2e0b6f3a;hp=e56e7fbbe8acf99eb26155b5eb2f617e83f226ed;hpb=5834db43b21308e958a2fdbbec082b1a4f019a38;p=inkscape.git diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index e56e7fbbe..c580d6767 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1,17 +1,20 @@ -#define __SP_DESKTOP_STYLE_C__ - /** \file * Desktop style management * * Authors: * bulia byak * verbalshadow + * Jon A. Cruz + * Abhishek Sharma * * Copyright (C) 2004, 2006 authors * * Released under GNU GPL, read the file 'COPYING' for more information */ +#include +#include + #include "desktop.h" #include "color-rgba.h" #include "svg/css-ostringstream.h" @@ -20,9 +23,9 @@ #include "selection.h" #include "inkscape.h" #include "style.h" -#include "prefs-utils.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" @@ -38,6 +41,7 @@ #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" @@ -99,7 +103,7 @@ sp_desktop_apply_css_recursive(SPObject *o, SPCSSAttr *css, bool skip_lines) || SP_IS_FLOWDIV(o) || SP_IS_FLOWPARA(o) || SP_IS_TEXTPATH(o)) - && !SP_OBJECT_REPR(o)->attribute("style")) + && !o->getAttribute("style")) && !(SP_IS_FLOWREGION(o) || SP_IS_FLOWREGIONEXCLUDE(o) || @@ -117,15 +121,15 @@ sp_desktop_apply_css_recursive(SPObject *o, SPCSSAttr *css, bool skip_lines) // Scale the style by the inverse of the accumulated parent transform in the paste context. { - NR::Matrix const local(sp_item_i2doc_affine(SP_ITEM(o))); - double const ex(NR::expansion(local)); + Geom::Matrix const local(SP_ITEM(o)->i2doc_affine()); + double const ex(local.descrim()); if ( ( ex != 0. ) && ( ex != 1. ) ) { sp_css_attr_scale(css_set, 1/ex); } } - sp_repr_css_change(SP_OBJECT_REPR(o), css_set, "style"); + o->changeCSS(css_set,"style"); sp_repr_css_attr_unref(css_set); } @@ -134,7 +138,7 @@ sp_desktop_apply_css_recursive(SPObject *o, SPCSSAttr *css, bool skip_lines) if (SP_IS_USE(o)) return; - for (SPObject *child = sp_object_first_child(SP_OBJECT(o)) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { + for ( SPObject *child = o->firstChild() ; child ; child = child->getNext() ) { if (sp_repr_css_property(css, "opacity", NULL) != NULL) { // Unset properties which are accumulating and thus should not be set recursively. // For example, setting opacity 0.5 on a group recursively would result in the visible opacity of 0.25 for an item in the group. @@ -156,22 +160,22 @@ void sp_desktop_set_style(SPDesktop *desktop, SPCSSAttr *css, bool change, bool write_current) { if (write_current) { -// 1. Set internal value + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + // 1. Set internal value sp_repr_css_merge(desktop->current, css); -// 1a. Write to prefs; make a copy and unset any URIs first + // 1a. Write to prefs; make a copy and unset any URIs first SPCSSAttr *css_write = sp_repr_css_attr_new(); 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"); + 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)) { 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"); - g_free (style_grp); + prefs->mergeStyle(Glib::ustring("/desktop/") + descr + "/style", css_write); } } } @@ -192,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); } } @@ -240,25 +267,28 @@ sp_desktop_get_color(SPDesktop *desktop, bool is_fill) } double -sp_desktop_get_master_opacity_tool(SPDesktop *desktop, char const *tool) +sp_desktop_get_master_opacity_tool(SPDesktop *desktop, Glib::ustring const &tool, bool *has_opacity) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); SPCSSAttr *css = NULL; gfloat value = 1.0; // default if nothing else found - if (prefs_get_double_attribute(tool, "usecurrent", 0) != 0) { + if (has_opacity) + *has_opacity = false; + if (prefs->getBool(tool + "/usecurrent")) { css = sp_desktop_get_style(desktop, true); - } else { - Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool); - if (tool_repr) { - css = sp_repr_css_attr_inherited(tool_repr, "style"); - } + } 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 + } else { + if (has_opacity) + *has_opacity = false; } } @@ -268,22 +298,20 @@ sp_desktop_get_master_opacity_tool(SPDesktop *desktop, char const *tool) return value; } double -sp_desktop_get_opacity_tool(SPDesktop *desktop, char const *tool, bool is_fill) +sp_desktop_get_opacity_tool(SPDesktop *desktop, Glib::ustring const &tool, bool is_fill) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); SPCSSAttr *css = NULL; gfloat value = 1.0; // default if nothing else found - if (prefs_get_double_attribute(tool, "usecurrent", 0) != 0) { + if (prefs->getBool(tool + "/usecurrent")) { css = sp_desktop_get_style(desktop, true); - } else { - Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool); - if (tool_repr) { - css = sp_repr_css_attr_inherited(tool_repr, "style"); - } + } 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 @@ -295,27 +323,30 @@ sp_desktop_get_opacity_tool(SPDesktop *desktop, char const *tool, bool is_fill) return value; } + guint32 -sp_desktop_get_color_tool(SPDesktop *desktop, char const *tool, bool is_fill) +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 - if (prefs_get_int_attribute(tool, "usecurrent", 0) != 0) { + if (has_color) + *has_color = false; + if (prefs->getBool(tool + "/usecurrent")) { css = sp_desktop_get_style(desktop, true); } else { - Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool); - if (tool_repr) { - css = sp_repr_css_attr_inherited(tool_repr, "style"); - } + 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)) { // and if it's not url, + if (strncmp(property, "url", 3) && strncmp(property, "none", 4)) { // and if it's not url or none, // read it r = sp_svg_read_color(property, r); + if (has_color) + *has_color = true; } } @@ -324,22 +355,22 @@ sp_desktop_get_color_tool(SPDesktop *desktop, char const *tool, bool is_fill) return r | 0xff; } + /** * Apply the desktop's current style or the tool style to repr. */ void -sp_desktop_apply_style_tool(SPDesktop *desktop, Inkscape::XML::Node *repr, char const *tool, bool with_text) +sp_desktop_apply_style_tool(SPDesktop *desktop, Inkscape::XML::Node *repr, Glib::ustring const &tool_path, bool with_text) { SPCSSAttr *css_current = sp_desktop_get_style(desktop, with_text); - if ((prefs_get_int_attribute(tool, "usecurrent", 0) != 0) && css_current) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + + if (prefs->getBool(tool_path + "/usecurrent") && css_current) { sp_repr_css_set(repr, css_current, "style"); } else { - Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool); - if (tool_repr) { - SPCSSAttr *css = sp_repr_css_attr_inherited(tool_repr, "style"); - sp_repr_css_set(repr, css, "style"); - sp_repr_css_attr_unref(css); - } + SPCSSAttr *css = prefs->getInheritedStyle(tool_path + "/style"); + sp_repr_css_set(repr, css, "style"); + sp_repr_css_attr_unref(css); } if (css_current) { sp_repr_css_attr_unref(css_current); @@ -354,21 +385,19 @@ 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) { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + Glib::ustring desktop_style = prefs->getString("/desktop/style"); + Glib::ustring style_str; + if ((prefs->getBool("/tools/text/usecurrent")) && !desktop_style.empty()) { style_str = desktop_style; } else { - Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, "tools.text"); - if (tool_repr) { - style_str = tool_repr->attribute("style"); - } + style_str = prefs->getString("/tools/text/style"); } double ret = 12; - if (style_str) { + if (!style_str.empty()) { SPStyle *style = sp_style_new(SP_ACTIVE_DOCUMENT); - sp_style_merge_from_style_string(style, style_str); + sp_style_merge_from_style_string(style, style_str.data()); ret = style->font_size.computed; sp_style_unref(style); } @@ -391,7 +420,7 @@ stroke_average_width (GSList const *objects) if (!SP_IS_ITEM (l->data)) continue; - NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(l->data)); + Geom::Matrix i2d = SP_ITEM(l->data)->i2d_affine(); SPObject *object = SP_OBJECT(l->data); @@ -402,7 +431,7 @@ stroke_average_width (GSList const *objects) notstroked = false; } - avgwidth += SP_OBJECT_STYLE (object)->stroke_width.computed * i2d.expansion(); + avgwidth += SP_OBJECT_STYLE (object)->stroke_width.computed * i2d.descrim(); } if (notstroked) @@ -411,6 +440,20 @@ stroke_average_width (GSList const *objects) return avgwidth / (g_slist_length ((GSList *) objects) - n_notstroked); } +static bool vectorsClose( std::vector const &lhs, std::vector 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. */ @@ -427,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; @@ -467,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 @@ -477,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 @@ -509,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; } } @@ -524,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 ++; } @@ -642,6 +691,7 @@ objects_query_strokewidth (GSList *objects, SPStyle *style_res) gdouble prev_sw = -1; bool same_sw = true; + bool noneSet = true; // is stroke set to none? int n_stroked = 0; @@ -651,14 +701,21 @@ objects_query_strokewidth (GSList *objects, SPStyle *style_res) 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 ++; - NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj)); - double sw = style->stroke_width.computed * i2d.expansion(); + noneSet &= style->stroke.isNone(); + + Geom::Matrix i2d = SP_ITEM(obj)->i2d_affine(); + double sw = style->stroke_width.computed * i2d.descrim(); if (prev_sw != -1 && fabs(sw - prev_sw) > 1e-3) same_sw = false; @@ -672,6 +729,7 @@ objects_query_strokewidth (GSList *objects, SPStyle *style_res) 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; @@ -849,16 +907,17 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res) 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) { @@ -873,7 +932,7 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res) if (!style) continue; texts ++; - size += style->font_size.computed * NR::expansion(sp_item_i2d_affine(SP_ITEM(obj))); /// \todo FIXME: we assume non-% units here + size += style->font_size.computed * Geom::Matrix(SP_ITEM(obj)->i2d_affine()).descrim(); /// \todo FIXME: we assume non-% units here if (style->letter_spacing.normal) { if (!different && (letterspacing_prev == 0 || letterspacing_prev == letterspacing)) @@ -883,6 +942,14 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res) 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; @@ -899,12 +966,14 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res) 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 @@ -918,6 +987,7 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res) if (texts > 1) { size /= texts; letterspacing /= texts; + wordspacing /= texts; linespacing /= texts; } @@ -927,6 +997,9 @@ objects_query_fontnumbers (GSList *objects, SPStyle *style_res) 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; @@ -994,6 +1067,101 @@ objects_query_fontstyle (GSList *objects, SPStyle *style_res) } } +/** + * 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. */ @@ -1012,10 +1180,12 @@ objects_query_fontfamily (GSList *objects, SPStyle *style_res) for (GSList const *i = objects; i != NULL; i = i->next) { SPObject *obj = SP_OBJECT (i->data); + // std::cout << " " << reinterpret_cast(i->data)->getId() << 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)) + && !SP_IS_FLOWDIV(obj) && !SP_IS_FLOWPARA(obj) && !SP_IS_FLOWTSPAN(obj)) { continue; + } SPStyle *style = SP_OBJECT_STYLE (obj); if (!style) continue; @@ -1065,31 +1235,37 @@ objects_query_fontspecification (GSList *objects, SPStyle *style_res) for (GSList const *i = objects; i != NULL; i = i->next) { SPObject *obj = SP_OBJECT (i->data); + // std::cout << " " << reinterpret_cast(i->data)->getId() << 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)) + && !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->text->font_specification.value && + 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_res->text->font_specification.value) { - g_free(style_res->text->font_specification.value); - style_res->text->font_specification.value = NULL; - } + 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); + style_res->text->font_specification.set = TRUE; + style_res->text->font_specification.value = g_strdup(style->text->font_specification.value); + } } - if (texts == 0 || !style_res->text->font_specification.set) + if (texts == 0) return QUERY_STYLE_NOTHING; if (texts > 1) { @@ -1112,7 +1288,7 @@ objects_query_blend (GSList *objects, SPStyle *style_res) 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); @@ -1197,14 +1373,14 @@ objects_query_blur (GSList *objects, SPStyle *style_res) 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); if (!style) continue; if (!SP_IS_ITEM(obj)) continue; - NR::Matrix i2d = sp_item_i2d_affine (SP_ITEM(obj)); + Geom::Matrix i2d = SP_ITEM(obj)->i2d_affine(); items ++; @@ -1215,12 +1391,12 @@ objects_query_blur (GSList *objects, SPStyle *style_res) 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); + blur_sum += num * i2d.descrim(); 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; @@ -1274,7 +1450,7 @@ sp_desktop_query_style_from_list (GSList *list, SPStyle *style, int property) } 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) { @@ -1283,6 +1459,8 @@ sp_desktop_query_style_from_list (GSList *list, SPStyle *style, int property) 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); @@ -1306,12 +1484,16 @@ sp_desktop_query_style(SPDesktop *desktop, SPStyle *style, int property) 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 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) @@ -1327,8 +1509,18 @@ sp_desktop_query_style_all (SPDesktop *desktop, SPStyle *query) 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 && 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); }