[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive] src: Fix animated geometry scale not correctly updated (composite & transform)
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-11-18 10:22:33
Message-ID: E1c7gJV-0005VN-9E () code ! kde ! org
[Download RAW message or body]

Git commit 94e1473fc4a5af7f16b16071df10956748f4dd06 by Jean-Baptiste Mardelle.
Committed on 18/11/2016 at 09:30.
Pushed by mardelle into branch 'master'.

Fix animated geometry scale not correctly  updated (composite & transform)
Fix transition not deselected when clicking in empty timeline

M  +5    -0    src/effectstack/widgets/animationwidget.cpp
M  +4    -1    src/timeline/customtrackview.cpp

http://commits.kde.org/kdenlive/94e1473fc4a5af7f16b16071df10956748f4dd06

diff --git a/src/effectstack/widgets/animationwidget.cpp \
b/src/effectstack/widgets/animationwidget.cpp index cc86e26..254303b 100644
--- a/src/effectstack/widgets/animationwidget.cpp
+++ b/src/effectstack/widgets/animationwidget.cpp
@@ -565,10 +565,13 @@ void AnimationWidget::updateRect(int pos)
     m_spinY->blockSignals(true);
     m_spinWidth->blockSignals(true);
     m_spinHeight->blockSignals(true);
+    m_spinSize->blockSignals(true);
     m_spinX->setValue(rect.x);
     m_spinY->setValue(rect.y);
     m_spinWidth->setValue(rect.w);
     m_spinHeight->setValue(rect.h);
+    double scale = qMin(rect.w / m_monitor->render->frameRenderWidth(), rect.h / \
m_monitor->render->renderHeight()); +    m_spinSize->setValue(100.0 * scale);
     if (m_spinOpacity) {
         m_spinOpacity->blockSignals(true);
         m_spinOpacity->setValue(100.0 * rect.o);
@@ -619,6 +622,7 @@ void AnimationWidget::updateRect(int pos)
     m_spinY->setEnabled(enableEdit);
     m_spinWidth->setEnabled(enableEdit);
     m_spinHeight->setEnabled(enableEdit);
+    m_spinSize->setEnabled(enableEdit);
     if (m_spinOpacity) {
         m_spinOpacity->setEnabled(enableEdit);
     }
@@ -626,6 +630,7 @@ void AnimationWidget::updateRect(int pos)
     m_spinY->blockSignals(false);
     m_spinWidth->blockSignals(false);
     m_spinHeight->blockSignals(false);
+    m_spinSize->blockSignals(false);
     m_endAttach->blockSignals(false);
     setupMonitor(QRect(rect.x, rect.y, rect.w, rect.h));
     // Restore default controller
diff --git a/src/timeline/customtrackview.cpp b/src/timeline/customtrackview.cpp
index 0d112fc..2db0e9f 100644
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@ -7661,7 +7661,10 @@ void CustomTrackView::clearSelection(bool emitInfo)
     scene()->clearSelection();
     if (m_dragItem) m_dragItem->setMainSelectedClip(false);
     m_dragItem = NULL;
-    if (emitInfo) emit clipItemSelected(NULL);
+    if (emitInfo) {
+        emit clipItemSelected(NULL);
+        emit transitionItemSelected(NULL);
+    }
 }
 
 void CustomTrackView::updatePalette()


[prev in list] [next in list] [prev in thread] [next in thread]