summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter
diff options
context:
space:
mode:
Diffstat (limited to 'src/live_effects/parameter')
-rw-r--r--src/live_effects/parameter/enum.h9
-rw-r--r--src/live_effects/parameter/parameter.cpp12
-rw-r--r--src/live_effects/parameter/parameter.h2
-rw-r--r--src/live_effects/parameter/point.cpp1
-rw-r--r--src/live_effects/parameter/powerstrokepointarray.cpp2
-rw-r--r--src/live_effects/parameter/satellitesarray.cpp1
-rw-r--r--src/live_effects/parameter/transformedpoint.cpp4
-rw-r--r--src/live_effects/parameter/unit.cpp2
-rw-r--r--src/live_effects/parameter/vector.cpp2
9 files changed, 15 insertions, 20 deletions
diff --git a/src/live_effects/parameter/enum.h b/src/live_effects/parameter/enum.h
index 0360a5f0a..cc100ad98 100644
--- a/src/live_effects/parameter/enum.h
+++ b/src/live_effects/parameter/enum.h
@@ -46,10 +46,14 @@ public:
regenum->set_active_by_id(value);
regenum->combobox()->setProgrammatically = false;
+ regenum->combobox()->signal_changed().connect(sigc::mem_fun (*this, &EnumParam::_on_change_combo));
regenum->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change enumeration parameter"));
+
return dynamic_cast<Gtk::Widget *> (regenum);
};
-
+ void _on_change_combo() {
+ param_effect->upd_params = true;
+ }
bool param_readSVGValue(const gchar * strvalue) override {
if (!strvalue) {
param_set_default();
@@ -89,9 +93,6 @@ public:
}
void param_set_value(E val) {
- if (value != val) {
- param_effect->upd_params = true;
- }
value = val;
}
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index 1bdd31a0f..158db91a4 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -41,7 +41,6 @@ Parameter::Parameter( Glib::ustring label, Glib::ustring tip,
void
Parameter::param_write_to_repr(const char * svgd)
{
- param_effect->upd_params = true;
param_effect->getRepr()->setAttribute(param_key.c_str(), svgd);
}
@@ -128,9 +127,6 @@ ScalarParam::param_update_default(const gchar * default_value)
void
ScalarParam::param_set_value(gdouble val)
{
- if (value != val) {
- param_effect->upd_params = true;
- }
value = val;
if (integer)
value = round(value);
@@ -182,7 +178,7 @@ ScalarParam::param_newWidget()
if (widget_is_visible) {
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() ) );
-
+
rsu->setValue(value);
rsu->setDigits(digits);
rsu->setIncrements(inc_step, inc_page);
@@ -191,7 +187,6 @@ ScalarParam::param_newWidget()
if (add_slider) {
rsu->addSlider();
}
- rsu->signal_button_release_event().connect(sigc::mem_fun (*this, &ScalarParam::on_button_release));
if(_set_undo){
rsu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change scalar parameter"));
}
@@ -201,11 +196,6 @@ ScalarParam::param_newWidget()
}
}
-bool ScalarParam::on_button_release(GdkEventButton* button_event) {
- param_effect->upd_params = true;
- return false;
-}
-
void
ScalarParam::param_set_digits(unsigned digits)
{
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index 040955e17..db2b7e13f 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -141,8 +141,6 @@ protected:
bool _set_undo;
private:
- bool on_button_release(GdkEventButton* button_event);
-
ScalarParam(const ScalarParam&) = delete;
ScalarParam& operator=(const ScalarParam&) = delete;
};
diff --git a/src/live_effects/parameter/point.cpp b/src/live_effects/parameter/point.cpp
index 292b8fdac..3cdfd72c0 100644
--- a/src/live_effects/parameter/point.cpp
+++ b/src/live_effects/parameter/point.cpp
@@ -209,6 +209,7 @@ PointParamKnotHolderEntity::knot_set(Geom::Point const &p, Geom::Point const &or
s = A;
}
}
+ pparam->param_effect->upd_params = true;
if(this->pparam->liveupdate){
pparam->param_setValue(s, true);
} else {
diff --git a/src/live_effects/parameter/powerstrokepointarray.cpp b/src/live_effects/parameter/powerstrokepointarray.cpp
index 4afe35e47..772088e81 100644
--- a/src/live_effects/parameter/powerstrokepointarray.cpp
+++ b/src/live_effects/parameter/powerstrokepointarray.cpp
@@ -179,7 +179,7 @@ PowerStrokePointArrayParamKnotHolderEntity::knot_set(Geom::Point const &p, Geom:
if (!valid_index(_index)) {
return;
}
-
+ _pparam->param_effect->upd_params = true;
/// @todo how about item transforms???
Piecewise<D2<SBasis> > const & pwd2 = _pparam->get_pwd2();
Piecewise<D2<SBasis> > const & n = _pparam->get_pwd2_normal();
diff --git a/src/live_effects/parameter/satellitesarray.cpp b/src/live_effects/parameter/satellitesarray.cpp
index b1e00b349..808d76fcd 100644
--- a/src/live_effects/parameter/satellitesarray.cpp
+++ b/src/live_effects/parameter/satellitesarray.cpp
@@ -455,6 +455,7 @@ void FilletChamferKnotHolderEntity::knot_set_offset(Satellite satellite)
if (!_pparam->_last_pathvector_satellites) {
return;
}
+ _pparam->param_effect->upd_params = true;
size_t total_satellites = _pparam->_last_pathvector_satellites->getTotalSatellites();
bool is_mirror = false;
size_t index = _index;
diff --git a/src/live_effects/parameter/transformedpoint.cpp b/src/live_effects/parameter/transformedpoint.cpp
index e35cbc04d..d7e42e28b 100644
--- a/src/live_effects/parameter/transformedpoint.cpp
+++ b/src/live_effects/parameter/transformedpoint.cpp
@@ -120,7 +120,7 @@ TransformedPointParam::param_newWidget()
pointwdg->setValue( vector, origin );
pointwdg->clearProgrammatically();
pointwdg->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change vector parameter"));
-
+
Gtk::HBox * hbox = Gtk::manage( new Gtk::HBox() );
static_cast<Gtk::HBox*>(hbox)->pack_start(*pointwdg, true, true);
static_cast<Gtk::HBox*>(hbox)->show_all_children();
@@ -166,9 +166,11 @@ public:
~TransformedPointParamKnotHolderEntity_Vector() override = default;
void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint /*state*/) override {
+ param->param_effect->upd_params = true;
Geom::Point const s = p - param->origin;
/// @todo implement angle snapping when holding CTRL
param->setVector(s);
+ param->set_and_write_new_values(param->origin, param->vector);
sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false);
};
Geom::Point knot_get() const override{
diff --git a/src/live_effects/parameter/unit.cpp b/src/live_effects/parameter/unit.cpp
index 9dbbaffac..d6c545f3b 100644
--- a/src/live_effects/parameter/unit.cpp
+++ b/src/live_effects/parameter/unit.cpp
@@ -90,7 +90,7 @@ UnitParam::param_newWidget()
unit_menu->setUnit(unit->abbr);
unit_menu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change unit parameter"));
-
+
return dynamic_cast<Gtk::Widget *> (unit_menu);
}
diff --git a/src/live_effects/parameter/vector.cpp b/src/live_effects/parameter/vector.cpp
index 0e8948268..365608a36 100644
--- a/src/live_effects/parameter/vector.cpp
+++ b/src/live_effects/parameter/vector.cpp
@@ -173,8 +173,10 @@ public:
~VectorParamKnotHolderEntity_Origin() override = default;
void knot_set(Geom::Point const &p, Geom::Point const &/*origin*/, guint state) override {
+ param->param_effect->upd_params = true;
Geom::Point const s = snap_knot_position(p, state);
param->setOrigin(s);
+ param->set_and_write_new_values(param->origin, param->vector);
sp_lpe_item_update_patheffect(SP_LPE_ITEM(item), false, false);
};
Geom::Point knot_get() const override {