From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sun, 20 Feb 2011 00:04:42 +0000 (+0000)
Subject: Fix drag widget not correctly emitting changes
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=c1d6f5e0743c4e1e11ab6f8bbe83ebabffde49fe;p=kdenlive

Fix drag widget not correctly emitting changes

svn path=/trunk/kdenlive/; revision=5435
---

diff --git a/src/doubleparameterwidget.cpp b/src/doubleparameterwidget.cpp
index 0925ce22..896a1382 100644
--- a/src/doubleparameterwidget.cpp
+++ b/src/doubleparameterwidget.cpp
@@ -54,9 +54,9 @@ DoubleParameterWidget::DoubleParameterWidget(const QString &name, int value, int
         m_commentLabel->setHidden(true);
         layout->addWidget(m_commentLabel, 1, 0, 1, -1);
     }
+    m_dragVal->setValue(value);
     connect(m_dragVal, SIGNAL(valueChanged(int, bool)), this, SLOT(slotSetValue(int, bool)));
     connect(m_dragVal, SIGNAL(inTimeline(int)), this, SIGNAL(setInTimeline(int)));
-    m_dragVal->setValue(value);
 }
 
 int DoubleParameterWidget::spinSize()
@@ -74,7 +74,6 @@ void DoubleParameterWidget::setValue(int value)
     m_dragVal->blockSignals(true);
     m_dragVal->setValue(value);
     m_dragVal->blockSignals(false);
-    //emit valueChanged(value);
 }
 
 void DoubleParameterWidget::slotSetValue(int value, bool final)
diff --git a/src/dragvalue.cpp b/src/dragvalue.cpp
index 377dd952..9ba6f2e5 100644
--- a/src/dragvalue.cpp
+++ b/src/dragvalue.cpp
@@ -272,16 +272,20 @@ void DragValue::focusInEvent(QFocusEvent* e)
 
 void DragValue::slotEditingFinished()
 {
-    qreal value;
     if (m_intEdit) {
-        value = m_intEdit->value();
+        int value = m_intEdit->value();
+        m_intEdit->blockSignals(true);
         m_intEdit->clearFocus();
+        m_intEdit->blockSignals(false);
+        if (!KdenliveSettings::dragvalue_directupdate()) emit valueChanged(value, true);
     }
     else {
-        value = m_doubleEdit->value();
+        double value = m_doubleEdit->value();
+        m_doubleEdit->blockSignals(true);
         m_doubleEdit->clearFocus();
+        m_doubleEdit->blockSignals(false);
+        if (!KdenliveSettings::dragvalue_directupdate()) emit valueChanged(value, true);
     }
-    emit valueChanged(value, true);
 }
 
 void DragValue::slotShowContextMenu(const QPoint& pos)