Add checkbox for LPEs to temporarily disable them on canvas (but keep them applied...

[inkscape.git] / src / live_effects / parameter / parameter.cpp

diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 67111ef9e003cca691a0dc1522dc0f6c25587d62..527f2fdd925ccf37bbc707d4c0454b44a0d7a61a 100644 (file)
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -10,9 +10,9 @@
 #include "live_effects/effect.h"
 #include "svg/svg.h"
 #include "libnr/nr-values.h"
-
+#include "xml/repr.h"
 #include <gtkmm.h>
-#include "ui/widget/scalar.h"
+#include "ui/widget/registered-widget.h"
 
 #include "svg/stringstream.h"
 
@@ -28,13 +28,13 @@ namespace LivePathEffect {
 Parameter::Parameter( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
                       Effect* effect )
-    : oncanvas_editable(false)
+    : param_key(key),
+      param_wr(wr),
+      param_label(label),
+      oncanvas_editable(false),
+      param_tooltip(tip),
+      param_effect(effect)
 {
-    param_label = label;
-    param_tooltip = tip;
-    param_key = key;
-    param_wr = wr;
-    param_effect = effect;
 }
 
 
@@ -50,16 +50,16 @@ Parameter::param_write_to_repr(const char * svgd)
 ScalarParam::ScalarParam( const Glib::ustring& label, const Glib::ustring& tip,
                       const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
                       Effect* effect, gdouble default_value)
-    : Parameter(label, tip, key, wr, effect)
+    : Parameter(label, tip, key, wr, effect),
+      value(default_value),
+      min(-NR_HUGE),
+      max(NR_HUGE),
+      integer(false),
+      defvalue(default_value),
+      digits(2),
+      inc_step(0.1),
+      inc_page(1)
 {
-    defvalue = default_value;
-    value = defvalue;
-    min = -NR_HUGE;
-    max = NR_HUGE;
-    integer = false;
-    inc_step = 0.1;
-    inc_page = 1;
-    digits = 2;
 }
 
 ScalarParam::~ScalarParam()
@@ -124,7 +124,7 @@ ScalarParam::param_make_integer(bool yes)
 }
 
 Gtk::Widget *
-ScalarParam::param_newWidget(Gtk::Tooltips * tooltips)
+ScalarParam::param_newWidget(Gtk::Tooltips * /*tooltips*/)
 {
     Inkscape::UI::Widget::RegisteredScalar *rsu = Gtk::manage( new Inkscape::UI::Widget::RegisteredScalar(
         param_label, param_tooltip, param_key, *param_wr, param_effect->getRepr(), param_effect->getSPDoc() ) );
@@ -133,6 +133,7 @@ ScalarParam::param_newWidget(Gtk::Tooltips * tooltips)
     rsu->setDigits(digits);
     rsu->setIncrements(inc_step, inc_page);
     rsu->setRange(min, max);
+    rsu->setProgrammatically = false;
 
     rsu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change scalar parameter"));