diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index 26f29d172067639d0ed610f78b7e8fe90992c611..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"
-#include "svg/svg-device-color.h"
#include "box3d-side.h"
/**
@@ -196,6 +196,10 @@ 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.
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.
*/
@@ -452,7 +470,6 @@ 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];
@@ -536,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;
}
}
@@ -552,22 +573,6 @@ objects_query_fillstroke (GSList *objects, SPStyle *style_res, bool const isfill
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 ++;
}
@@ -607,14 +612,6 @@ 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;