[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 <null () kde ! org>
Date:       2017-01-05 20:51:41
Message-ID: E1cPF0f-0006Ks-2D () code ! kde ! org
[Download RAW message or body]

Git commit 5e7a6175f532a5b457f896ee7863d3198dc9f1c0 by Jean-Baptiste Mardelle.
Committed on 05/01/2017 at 20:51.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +14   -11   src/simplekeyframes/simpletimelinewidget.cpp
M  +1    -0    src/simplekeyframes/simpletimelinewidget.h
M  +2    -1    src/titler/titlewidget.cpp

https://commits.kde.org/kdenlive/5e7a6175f532a5b457f896ee7863d3198dc9f1c0

diff --cc src/simplekeyframes/simpletimelinewidget.cpp
index ff086574d,69f6ce955..16cb07b42
--- a/src/simplekeyframes/simpletimelinewidget.cpp
+++ b/src/simplekeyframes/simpletimelinewidget.cpp
@@@ -25,15 -25,15 +25,14 @@@
  #include <QFontDatabase>
  #include <KColorScheme>
  
 -
 -SimpleTimelineWidget::SimpleTimelineWidget(QWidget* parent) :
 -        QWidget(parent),
 -        m_duration(1),
 -        m_position(0),
 -        m_currentKeyframe(-1),
 -        m_currentKeyframeOriginal(-1),
 -        m_hoverKeyframe(-1),
 -        m_scale(1)
 +SimpleTimelineWidget::SimpleTimelineWidget(QWidget *parent) :
 +    QWidget(parent),
 +    m_duration(1),
 +    m_position(0),
 +    m_currentKeyframe(-1),
 +    m_currentKeyframeOriginal(-1),
 +    m_hoverKeyframe(-1),
-     m_lineHeight(10),
 +    m_scale(1)
  {
      setMouseTracking(true);
      setMinimumSize(QSize(150, 20));
@@@ -308,9 -297,12 +309,11 @@@ void SimpleTimelineWidget::paintEvent(Q
      /*
       * current position
       */
-     QPolygonF position = QPolygonF() << QPointF(0, 1) << QPointF(5, 6) << \
QPointF(-5, 6); +     QPolygon pa(3);
+     int cursorwidth = (m_size - (m_lineHeight + headOffset / 2)) / 2 + 1;
+     QPolygonF position = QPolygonF() << QPointF(-cursorwidth, m_size) << \
QPointF(cursorwidth, m_size) << QPointF(0, m_lineHeight + (headOffset / 2) + 1);  \
position.translate(m_position * m_scale, 0);  p.setBrush(m_colKeyframe);
-     p.drawConvexPolygon(position);
+     p.drawPolygon(position);
  }
  
 -
diff --cc src/simplekeyframes/simpletimelinewidget.h
index 1a12f24ae,b4e5ce6be..f0f32a7b8
--- a/src/simplekeyframes/simpletimelinewidget.h
+++ b/src/simplekeyframes/simpletimelinewidget.h
@@@ -52,9 -52,10 +52,10 @@@ private
      int m_currentKeyframe;
      int m_currentKeyframeOriginal;
      int m_hoverKeyframe;
 -    QList <int> m_keyframes;
 +    QList<int> m_keyframes;
      int m_lineHeight;
      double m_scale;
+     int m_size;
  
      QColor m_colSelected;
      QColor m_colKeyframe;
diff --cc src/titler/titlewidget.cpp
index 622675acc,ebf45c897..da6edfa19
--- a/src/titler/titlewidget.cpp
+++ b/src/titler/titlewidget.cpp
@@@ -106,7 -106,9 +106,8 @@@ TitleWidget::TitleWidget(const QUrl &ur
  
      backgroundAlpha->setMinimum(0);
      backgroundAlpha->setMaximum(255);
-     //backgroundAlpha->setDecimals(0);
+     bgAlphaSlider->setMinimum(0);
+     bgAlphaSlider->setMaximum(255);
 -   //backgroundAlpha->setDecimals(0);
      backgroundAlpha->setValue(0);
      backgroundAlpha->setToolTip(i18n("Background color opacity"));
  


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