fix setting blend mode to Normal

[inkscape.git] / src / ui / widget / object-composite-settings.cpp

diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 1e277fa0dcc6cfdfbde4395aa1453bcb2d8f23c6..ea1e8086db18c10380a6d0eb95768056578ed4dd 100644 (file)
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -4,8 +4,9 @@
  * Authors:
  *   Bryce W. Harrington <bryce@bryceharrington.org>
  *   Gustav Broberg <broberg@kth.se>
+ *   Niko Kiirala <niko@kiirala.com>
  *
- * Copyright (C) 2004--2007 Authors
+ * Copyright (C) 2004--2008 Authors
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
@@ -32,7 +33,7 @@ namespace Inkscape {
 namespace UI {
 namespace Widget {
 
-void ObjectCompositeSettings::_on_desktop_switch(
+void ObjectCompositeSettings::_on_desktop_activate(
     Inkscape::Application */*application*/,
     SPDesktop *desktop,
     ObjectCompositeSettings *w
@@ -42,6 +43,16 @@ void ObjectCompositeSettings::_on_desktop_switch(
     }
 }
 
+void ObjectCompositeSettings::_on_desktop_deactivate(
+    Inkscape::Application */*application*/,
+    SPDesktop *desktop,
+    ObjectCompositeSettings *w
+) {
+    if (w->_subject) {
+        w->_subject->setDesktop(NULL);
+    }
+}
+
 ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char const *history_prefix, int flags)
 : _verb_code(verb_code),
   _blur_tag(Glib::ustring(history_prefix) + ":blur"),
@@ -76,7 +87,8 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
 
     show_all_children();
 
-    _desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_switch), this );
+    _desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "activate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_activate), this );
+    _desktop_activated = g_signal_connect ( G_OBJECT (INKSCAPE), "deactivate_desktop", G_CALLBACK (&ObjectCompositeSettings::_on_desktop_deactivate), this );
 }
 
 ObjectCompositeSettings::~ObjectCompositeSettings() {
@@ -104,6 +116,7 @@ ObjectCompositeSettings::_blendBlurValueChanged()
     if (!desktop) {
         return;
     }
+    SPDocument *document = sp_desktop_document (desktop);
 
     if (_blocked)
         return;
@@ -112,10 +125,10 @@ ObjectCompositeSettings::_blendBlurValueChanged()
     // FIXME: fix for GTK breakage, see comment in SelectedStyle::on_opacity_changed; here it results in crash 1580903
     sp_canvas_force_full_redraw_after_interruptions(sp_desktop_canvas(desktop), 0);
 
-    NR::Maybe<NR::Rect> bbox = _subject->getBounds(SPItem::GEOMETRIC_BBOX);
+    Geom::OptRect bbox = _subject->getBounds(SPItem::GEOMETRIC_BBOX);
     double radius;
     if (bbox) {
-        double perimeter = bbox->extent(NR::X) + bbox->extent(NR::Y);
+        double perimeter = bbox->dimensions()[Geom::X] + bbox->dimensions()[Geom::Y];   // fixme: this is only half the perimeter, is that correct?
         radius = _fe_cb.get_blur_value() * perimeter / 400;
     } else {
         radius = 0;
@@ -123,38 +136,39 @@ ObjectCompositeSettings::_blendBlurValueChanged()
 
     const Glib::ustring blendmode = _fe_cb.get_blend_mode();
 
-    SPFilter *filter = 0;
-    const bool remfilter = (blendmode == "normal" && radius == 0) || (blendmode == "filter" && !filter);
-
-    if(blendmode != "filter" || filter) {
-        SPDocument *document = sp_desktop_document (desktop);
-
-        //apply created filter to every selected item
-        for (StyleSubject::iterator i = _subject->begin() ; i != _subject->end() ; ++i ) {
-            if (!SP_IS_ITEM(*i)) {
-                continue;
-            }
-
-            SPItem * item = SP_ITEM(*i);
-            SPStyle *style = SP_OBJECT_STYLE(item);
-            g_assert(style != NULL);
-
-            if(remfilter) {
-                remove_filter (item, false);
-            }
-            else {
-                if(blendmode != "filter")
-                    filter = new_filter_simple_from_item(document, item, blendmode.c_str(), radius);
-                sp_style_set_property_url (SP_OBJECT(item), "filter", SP_OBJECT(filter), false);
-            }
-
-            //request update
-            SP_OBJECT(item)->requestDisplayUpdate(( SP_OBJECT_MODIFIED_FLAG |
-                                                    SP_OBJECT_STYLE_MODIFIED_FLAG ));
+    //apply created filter to every selected item
+    for (StyleSubject::iterator i = _subject->begin() ; i != _subject->end() ; ++i ) {
+        if (!SP_IS_ITEM(*i)) {
+            continue;
         }
+
+        SPItem * item = SP_ITEM(*i);
+        SPStyle *style = SP_OBJECT_STYLE(item);
+        g_assert(style != NULL);
+
+        if (blendmode != "normal") {
+            SPFilter *filter = new_filter_simple_from_item(document, item, blendmode.c_str(), radius);
+            sp_style_set_property_url(item, "filter", filter, false);
+        } else {
+            sp_style_set_property_url(item, "filter", NULL, false);
+        }
+
+        if (radius == 0 && item->style->filter.set
+            && filter_is_single_gaussian_blur(SP_FILTER(item->style->getFilter()))) {
+            remove_filter(item, false);
+        }
+        else if (radius != 0) {
+            SPFilter *filter = modify_filter_gaussian_blur_from_item(document, item, radius);
+            sp_style_set_property_url(item, "filter", filter, false);
+        }
+
+        //request update
+        item->requestDisplayUpdate(( SP_OBJECT_MODIFIED_FLAG |
+                                     SP_OBJECT_STYLE_MODIFIED_FLAG ));
     }
 
-    sp_document_maybe_done (sp_desktop_document (desktop), _blur_tag.c_str(), _verb_code, _("Change blur"));
+    sp_document_maybe_done (document, _blur_tag.c_str(), _verb_code,
+                            _("Change blur"));
 
     // resume interruptibility
     sp_canvas_end_forced_full_redraws(sp_desktop_canvas(desktop));
@@ -259,9 +273,9 @@ ObjectCompositeSettings::_subjectChanged() {
             case QUERY_STYLE_SINGLE:
             case QUERY_STYLE_MULTIPLE_AVERAGED:
             case QUERY_STYLE_MULTIPLE_SAME:
-                NR::Maybe<NR::Rect> bbox = _subject->getBounds(SPItem::GEOMETRIC_BBOX);
+                Geom::OptRect bbox = _subject->getBounds(SPItem::GEOMETRIC_BBOX);
                 if (bbox) {
-                    double perimeter = bbox->extent(NR::X) + bbox->extent(NR::Y);
+                    double perimeter = bbox->dimensions()[Geom::X] + bbox->dimensions()[Geom::Y];   // fixme: this is only half the perimeter, is that correct?
                     _fe_cb.set_blur_sensitive(true);
                     //update blur widget value
                     float radius = query->filter_gaussianBlur_deviation.value;