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

List:       kde-commits
Subject:    [kdenlive] src: Merge branch '16.12'
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-11-29 0:42:43
Message-ID: E1cBWVP-0003Dr-O0 () code ! kde ! org
[Download RAW message or body]

Git commit cbca2a8cfef6ae1509f66179ce7c88af90d601d8 by Jean-Baptiste Mardelle.
Committed on 29/11/2016 at 00:42.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +0    -1    src/effectstack/dragvalue.cpp
M  +14   -3    src/effectstack/effectstackview2.cpp
M  +3    -0    src/effectstack/effectstackview2.h
M  +3    -3    src/effectstack/widgets/animationwidget.cpp
M  +15   -0    src/timeline/abstractclipitem.cpp
M  +1    -0    src/timeline/abstractclipitem.h
M  +16   -4    src/timeline/clipitem.cpp
M  +0    -4    src/timeline/customtrackview.cpp
M  +24   -1    src/timeline/keyframeview.cpp
M  +2    -0    src/timeline/keyframeview.h

https://commits.kde.org/kdenlive/cbca2a8cfef6ae1509f66179ce7c88af90d601d8

diff --cc src/effectstack/effectstackview2.cpp
index 3d07da5,9fdc97d..6434758
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@@ -278,9 -282,10 +282,10 @@@ void EffectStackView2::slotTrackItemSel
  void EffectStackView2::setupListView()
  {
      blockSignals(true);
+     m_scrollTimer.stop();
      m_monitorSceneWanted = MonitorSceneDefault;
 -    m_draggedEffect = NULL;
 -    m_draggedGroup = NULL;
 +    m_draggedEffect = Q_NULLPTR;
 +    m_draggedGroup = Q_NULLPTR;
      disconnect(m_effectMetaInfo.monitor, SIGNAL(renderPosition(int)), this, \
SLOT(slotRenderPos(int)));  QWidget *view = m_effect->container->takeWidget();
      if (view) {
diff --cc src/timeline/keyframeview.h
index ac836d2,2eef776..9b2976e
--- a/src/timeline/keyframeview.h
+++ b/src/timeline/keyframeview.h
@@@ -88,11 -88,13 +88,13 @@@ public
        */
      void drawKeyFrames(QRectF br, int length, bool active, QPainter *painter, const \
QTransform &transformation);  /** @brief Draw the x, y, w, h channels of an animated \
                geometry */
 -    void drawKeyFrameChannels(QRectF br, int in, int out, QPainter *painter, QList \
<QPoint> maximas, int limitKeyframes, QColor textColor);  +    void \
drawKeyFrameChannels(QRectF br, int in, int out, QPainter *painter, const \
QList<QPoint> &maximas, int limitKeyframes, const QColor &textColor);  int \
mouseOverKeyFrames(QRectF br, QPointF pos, double scale);  void showMenu(QWidget \
                *parent, QPoint pos);
 -    QAction *parseKeyframeActions(QList <QAction *>actions);
 +    QAction *parseKeyframeActions(const QList<QAction *> &actions);
      static QString cutAnimation(const QString &animation, int start, int duration, \
int fullduration, bool doCut = true); +     /** @brief when an animation is resized, \
update in / out point keyframes */ +     static QString switchAnimation(QString \
                animation, int newPos, int oldPos, int newDuration, int oldDuration, \
                bool isRect);
      /** @brief when loading an animation from a serialized string, check where is \
the first negative keyframe) */  static int checkNegatives(const QString &data, int \
                maxDuration);
      /** @brief returns true if currently edited parameter name is name */


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