Revert "dont set value when setting default"
This reverts commit 13485a2587.
This commit is contained in:
@@ -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<LabelSlider*>(sender());
|
||||
|
||||
@@ -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);
|
||||
};
|
||||
|
||||
|
||||
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user