From a24e5c3c33481a924b14f99daff02df2e1a29787 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 17 Mar 2019 09:48:42 +1100 Subject: [PATCH] Revert "dont set value when setting default" This reverts commit 13485a2587a5b947de25cdf26cdaac669625395d. --- effects/fields/doublefield.cpp | 11 +++++++++++ effects/fields/doublefield.h | 3 +++ effects/internal/transformeffect.cpp | 6 ------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/effects/fields/doublefield.cpp b/effects/fields/doublefield.cpp index a4fdadd05..a62836c52 100644 --- a/effects/fields/doublefield.cpp +++ b/effects/fields/doublefield.cpp @@ -9,6 +9,7 @@ DoubleField::DoubleField(EffectRow* parent, const QString& id) : default_(0), display_type_(LabelSlider::Normal), frame_rate_(30), + value_set_(false), kdc_(nullptr) { connect(this, SIGNAL(Changed()), this, SLOT(ValueHasBeenSet()), Qt::DirectConnection); @@ -34,6 +35,11 @@ void DoubleField::SetMaximum(double maximum) void DoubleField::SetDefault(double d) { default_ = d; + + if (!value_set_) { + SetValueAt(0, d); + value_set_ = false; + } } void DoubleField::SetDisplayType(LabelSlider::DisplayType type) @@ -100,6 +106,11 @@ void DoubleField::UpdateWidgetValue(QWidget *widget, double timecode) } } +void DoubleField::ValueHasBeenSet() +{ + value_set_ = true; +} + void DoubleField::UpdateFromWidget(double d) { LabelSlider* ls = static_cast(sender()); diff --git a/effects/fields/doublefield.h b/effects/fields/doublefield.h index 2c7ae3d7f..9b2882f4e 100644 --- a/effects/fields/doublefield.h +++ b/effects/fields/doublefield.h @@ -48,8 +48,11 @@ private: LabelSlider::DisplayType display_type_; double frame_rate_; + bool value_set_; + KeyframeDataChange* kdc_; private slots: + void ValueHasBeenSet(); void UpdateFromWidget(double d); }; diff --git a/effects/internal/transformeffect.cpp b/effects/internal/transformeffect.cpp index e5627fbae..03c219dcd 100644 --- a/effects/internal/transformeffect.cpp +++ b/effects/internal/transformeffect.cpp @@ -144,17 +144,11 @@ TransformEffect::TransformEffect(Clip* c, const EffectMeta* em) : Effect(c, em) blend_mode_box->SetValueAt(0, ""); anchor_x_box->SetDefault(0); anchor_y_box->SetDefault(0); - opacity->SetValueAt(0, 100); opacity->SetDefault(100); - scale_x->SetValueAt(0, 100); scale_x->SetDefault(100); - scale_y->SetValueAt(0, 100); scale_y->SetDefault(100); refresh(); - - position_x->SetValueAt(0, parent_clip->sequence->width/2); - position_y->SetValueAt(0, parent_clip->sequence->height/2); } void TransformEffect::refresh() {