reimplemented dragging all field types

effects/effect.h

@@ -42,7 +42,6 @@
 
 #include "ui/collapsiblewidget.h"
 #include "ui/checkboxex.h"
-#include "effectfields.h"
 #include "effectrow.h"
 #include "effectgizmo.h"
 

effects/effectfield.h

@@ -26,6 +26,7 @@
 #include <QVector>
 
 #include "effects/keyframe.h"
+#include "undo/undo.h"
 
 class EffectRow;
 class ComboAction;

effects/effectgizmo.cpp

@@ -21,8 +21,8 @@
 #include "effectgizmo.h"
 
 #include "ui/labelslider.h"
-#include "effectfields/doublefield.h"
-#include "project/effect.h"
+#include "effects/fields/doublefield.h"
+#include "effects/effect.h"
 
 EffectGizmo::EffectGizmo(Effect *parent, int type) :
   QObject(parent),

effects/effectrow.cpp

@@ -183,8 +183,32 @@ void EffectRow::ToggleKeyframe() {
   } else {
 
     // If we DID find keyframes at this time, delete them
-    for (int i=0;i<key_fields.size();i++) {
-      ca->append(new KeyframeDelete(key_fields.at(i), key_field_index.at(i)));
+
+    QVector<EffectField*> sorted_key_fields;
+    QVector<int> sorted_key_field_index;
+
+    // Since QVectors shift themselves when removing items, we need to sort these in reverse order
+    for (int i=0;i<key_field_index.size();i++) {
+      bool found = false;
+
+      for (int j=0;j<sorted_key_field_index.size();j++) {
+        if (sorted_key_field_index.at(j) < key_field_index.at(i)) {
+          sorted_key_fields.insert(j, key_fields.at(i));
+          sorted_key_field_index.insert(j, key_field_index.at(i));
+
+          found = true;
+          break;
+        }
+      }
+
+      if (!found) {
+        sorted_key_fields.append(key_fields.at(i));
+        sorted_key_field_index.append(key_field_index.at(i));
+      }
+    }
+
+    for (int i=0;i<sorted_key_fields.size();i++) {
+      ca->append(new KeyframeDelete(sorted_key_fields.at(i), sorted_key_field_index.at(i)));
     }
 
   }
@@ -215,7 +239,13 @@ void EffectRow::FocusRow() {
 void EffectRow::SetKeyframeOnAllFields(ComboAction* ca) {
   for (int i=0;i<FieldCount();i++) {
     EffectField* field = Field(i);
+
+    KeyframeDataChange* kdc = new KeyframeDataChange(field);
+
     field->SetValueAt(field->Now(), field->GetValueAt(field->Now()));
+
+    kdc->SetNewKeyframes();
+    ca->append(kdc);
   }
 
   panel_effect_controls->update_keyframes();

effects/fields/boolfield.cpp

@@ -48,5 +48,10 @@ QString BoolField::ConvertValueToString(const QVariant &v)
 
 void BoolField::UpdateFromWidget(bool b)
 {
+  KeyframeDataChange* kdc = new KeyframeDataChange(this);
+
   SetValueAt(Now(), b);
+
+  kdc->SetNewKeyframes();
+  olive::UndoStack.push(kdc);
 }

effects/fields/colorfield.cpp

@@ -42,5 +42,10 @@ QString ColorField::ConvertValueToString(const QVariant &v)
 
 void ColorField::UpdateFromWidget(const QColor& c)
 {
+  KeyframeDataChange* kdc = new KeyframeDataChange(this);
+
   SetValueAt(Now(), c);
+
+  kdc->SetNewKeyframes();
+  olive::UndoStack.push(kdc);
 }

effects/fields/combofield.cpp

@@ -54,5 +54,10 @@ void ComboField::UpdateWidgetValue(QWidget *widget, double timecode)
 
 void ComboField::UpdateFromWidget(int index)
 {
+  KeyframeDataChange* kdc = new KeyframeDataChange(this);
+
   SetValueAt(Now(), items_.at(index).data);
+
+  kdc->SetNewKeyframes();
+  olive::UndoStack.push(kdc);
 }

effects/fields/doublefield.cpp

@@ -1,6 +1,6 @@
 #include "doublefield.h"
 
-#include <QDebug>
+#include "effects/effectrow.h"
 
 DoubleField::DoubleField(EffectRow* parent, const QString& id) :
   EffectField(parent, id, EFFECT_FIELD_DOUBLE),
@@ -9,7 +9,8 @@ DoubleField::DoubleField(EffectRow* parent, const QString& id) :
   default_(0),
   display_type_(LabelSlider::Normal),
   frame_rate_(30),
-  value_set_(false)
+  value_set_(false),
+  kdc_(nullptr)
 {
   connect(this, SIGNAL(Changed()), this, SLOT(ValueHasBeenSet()), Qt::DirectConnection);
 }
@@ -94,5 +95,18 @@ void DoubleField::ValueHasBeenSet()
 
 void DoubleField::UpdateFromWidget(double d)
 {
+  LabelSlider* ls = static_cast<LabelSlider*>(sender());
+
+  if (ls->IsDragging() && kdc_ == nullptr) {
+    kdc_ = new KeyframeDataChange(this);
+  }
+
   SetValueAt(Now(), d);
+  GetParentRow()->SetKeyframeOnAllFields(nullptr);
+
+  if (!ls->IsDragging() && kdc_ != nullptr) {
+    kdc_->SetNewKeyframes();
+    olive::UndoStack.push(kdc_);
+    kdc_ = nullptr;
+  }
 }

effects/fields/doublefield.h

@@ -46,6 +46,8 @@ private:
   double frame_rate_;
 
   bool value_set_;
+
+  KeyframeDataChange* kdc_;
 private slots:
   void ValueHasBeenSet();
   void UpdateFromWidget(double d);

effects/fields/filefield.cpp

@@ -25,5 +25,10 @@ QWidget *FileField::CreateWidget()
 
 void FileField::UpdateFromWidget(const QString &s)
 {
+  KeyframeDataChange* kdc = new KeyframeDataChange(this);
+
   SetValueAt(Now(), s);
+
+  kdc->SetNewKeyframes();
+  olive::UndoStack.push(kdc);
 }

effects/fields/fontfield.cpp

@@ -54,5 +54,10 @@ void FontField::UpdateWidgetValue(QWidget *widget, double timecode)
 
 void FontField::UpdateFromWidget(const QString& s)
 {
+  KeyframeDataChange* kdc = new KeyframeDataChange(this);
+
   SetValueAt(Now(), s);
+
+  kdc->SetNewKeyframes();
+  olive::UndoStack.push(kdc);
 }

effects/fields/stringfield.cpp

@@ -41,5 +41,10 @@ void StringField::UpdateWidgetValue(QWidget *widget, double timecode)
 
 void StringField::UpdateFromWidget(const QString &s)
 {
+  KeyframeDataChange* kdc = new KeyframeDataChange(this);
+
   SetValueAt(Now(), s);
+
+  kdc->SetNewKeyframes();
+  olive::UndoStack.push(kdc);
 }