Filter effects dialog:

A couple bug fixes; the Link togglebutton for dual spinsliders now updates properly when switching between primitives. Also, the in2 attribute of feDisplacementMap is now properly checked when reordering primitives.

diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 3c5a351e67be9cb9b396ff449f678fec3eec3145..fe2e8f1c6fc66283f19813fdb8d62e70080e3a0e 100644 (file)
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1629,6 +1629,10 @@ void check_single_connection(SPFilterPrimitive* prim, const int result)
             if(SP_FECOMPOSITE(prim)->in2 == result)
                 SP_OBJECT_REPR(prim)->setAttribute("in2", 0);
         }
+        else if(SP_IS_FEDISPLACEMENTMAP(prim)) {
+            if(SP_FEDISPLACEMENTMAP(prim)->in2 == result)
+                SP_OBJECT_REPR(prim)->setAttribute("in2", 0);
+        }
     }
 }
 

diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp
index 8e2cbc0264bda7505094f24642e79247c37b0e9c..15cd5ea1b881946b207ac7f3b7e49f64dad360ab 100644 (file)
--- a/src/ui/widget/spin-slider.cpp
+++ b/src/ui/widget/spin-slider.cpp
@@ -148,6 +148,8 @@ void DualSpinSlider::set_from_attribute(SPObject* o)
             if(toks[1])
                 v2 = Glib::Ascii::strtod(toks[1]);
 
+            _link.set_active(toks[1] == 0);
+
             _s1.get_adjustment().set_value(v1);
             _s2.get_adjustment().set_value(v2);