[Kdenlive-svn] [kdenlive/v0.9] src: Fix timeline seek sometimes not refreshing on last frame of the seek, small update for monitor ruler colors

[Jean-Baptiste M. <jb...@kd...>]

Git commit 3e0341727e4bd9e5cf768e7beb633a68a10b33bd by Jean-Baptiste Mardelle.
Committed on 09/02/2013 at 19:49.
Pushed by mardelle into branch 'v0.9'.

Fix timeline seek sometimes not refreshing on last frame of the seek, small update for monitor ruler colors

M  +6    -4    src/customruler.cpp
M  +5    -3    src/renderer.cpp
M  +9    -9    src/smallruler.cpp
M  +1    -1    src/smallruler.h

http://commits.kde.org/kdenlive/3e0341727e4bd9e5cf768e7beb633a68a10b33bd

diff --git a/src/customruler.cpp b/src/customruler.cpp
index a02c2f6..9214198 100644
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -76,6 +76,7 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) :
     updateFrameSize();
     m_scale = 3;
     m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color();
+    m_zoneColor.setAlpha(180);
     m_zoneStart = 0;
     m_zoneEnd = 100;
     m_contextMenu = new QMenu(this);
@@ -95,6 +96,7 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) :
 void CustomRuler::updatePalette()
 {
     m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color();
+    m_zoneColor.setAlpha(180);
 }
 
 void CustomRuler::updateProjectFps(Timecode t)
@@ -222,10 +224,10 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event)
         int pos = (int)((event->x() + m_offset));
 	if (m_cursorColor == palette().text() && qAbs(pos - m_view->cursorPos() * m_factor) < 7) {
 	    // Mouse is over cursor
-	    m_cursorColor = palette().highlight();
+	    m_cursorColor = palette().link();
 	    update(m_view->cursorPos() * m_factor - m_offset - 10, LABEL_SIZE + 2, 20, MAX_HEIGHT - LABEL_SIZE - 2);
 	}
-	else if (m_cursorColor == palette().highlight() && qAbs(pos - m_view->cursorPos() * m_factor) >= 7) {
+	else if (m_cursorColor == palette().link() && qAbs(pos - m_view->cursorPos() * m_factor) >= 7) {
 	    m_cursorColor = palette().text();
 	    update(m_view->cursorPos() * m_factor - m_offset - 10, LABEL_SIZE + 2, 20, MAX_HEIGHT - LABEL_SIZE - 2);
 	}
@@ -256,7 +258,7 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event)
 void CustomRuler::leaveEvent(QEvent * event)
 {
     QWidget::leaveEvent(event);
-    if (m_cursorColor == palette().highlight()) {
+    if (m_cursorColor == palette().link()) {
 	m_cursorColor = palette().text();
 	update();
     }
@@ -489,7 +491,7 @@ void CustomRuler::paintEvent(QPaintEvent *e)
     p.drawPolygon(pa);
     
     if (m_lastSeekPosition != SEEK_INACTIVE && m_lastSeekPosition != m_view->cursorPos()) {
-	p.fillRect(m_lastSeekPosition * m_factor - m_offset - 1, BIG_MARK_X + 1, 3, MAX_HEIGHT - BIG_MARK_X - 1, palette().highlight());
+	p.fillRect(m_lastSeekPosition * m_factor - m_offset - 1, BIG_MARK_X + 1, 3, MAX_HEIGHT - BIG_MARK_X - 1, palette().linkVisited());
     }
 
 }
diff --git a/src/renderer.cpp b/src/renderer.cpp
index 23503f0..eea8cd8 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1803,13 +1803,15 @@ int Render::getCurrentSeekPosition() const
 void Render::emitFrameNumber()
 {
     int currentPos = m_mltConsumer->position();
-    if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
+    if (currentPos == requestedSeekPosition) {
+	requestedSeekPosition = SEEK_INACTIVE;
+	m_paused = true;
+    }
     emit rendererPosition(currentPos);
     if (requestedSeekPosition != SEEK_INACTIVE) {
 	m_mltConsumer->purge();
 	m_mltProducer->seek(requestedSeekPosition);
-	if (m_mltProducer->get_speed() == 0 && m_paused) {
-	    m_paused = false;
+	if (m_mltProducer->get_speed() == 0 && !m_paused) {
 	    m_mltConsumer->set("refresh", 1);
 	}
 	requestedSeekPosition = SEEK_INACTIVE;
diff --git a/src/smallruler.cpp b/src/smallruler.cpp
index 2d45f57..cc5f199 100644
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -43,7 +43,8 @@ SmallRuler::SmallRuler(Monitor *monitor, Render *render, QWidget *parent) :
     m_zoneStart = 10;
     m_zoneEnd = 60;
     KSharedConfigPtr config = KSharedConfig::openConfig(KdenliveSettings::colortheme());
-    m_zoneBrush = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, config);
+    m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, config).brush(this).color();
+    m_zoneColor.setAlpha(180);
 
     setMouseTracking(true);
     setMinimumHeight(8);
@@ -148,7 +149,7 @@ void SmallRuler::mouseReleaseEvent(QMouseEvent * event)
 void SmallRuler::leaveEvent(QEvent * event)
 {
     QWidget::leaveEvent(event);
-    if (m_cursorColor == palette().highlight()) {
+    if (m_cursorColor == palette().link()) {
 	m_cursorColor = palette().text();
 	update();
     }
@@ -168,10 +169,10 @@ void SmallRuler::mouseMoveEvent(QMouseEvent * event)
     else {
 	if (m_cursorColor == palette().text() && qAbs(pos - m_cursorFramePosition) * m_scale < 7) {
 	    // Mouse is over cursor
-	    m_cursorColor = palette().highlight();
+	    m_cursorColor = palette().link();
 	    update();
 	}
-	else if (m_cursorColor == palette().highlight() && qAbs(pos - m_cursorFramePosition) * m_scale >= 7) {
+	else if (m_cursorColor == palette().link() && qAbs(pos - m_cursorFramePosition) * m_scale >= 7) {
 	    m_cursorColor = palette().text();
 	    update();
 	}
@@ -240,9 +241,7 @@ void SmallRuler::updatePixmap()
 
     const int zoneStart = (int)(m_zoneStart * m_scale);
     const int zoneEnd = (int)(m_zoneEnd * m_scale);
-    p.setPen(Qt::NoPen);
-    p.setBrush(m_zoneBrush.brush(this));
-    p.drawRect(zoneStart, 0, zoneEnd - zoneStart, height());
+    p.fillRect(zoneStart, 0, zoneEnd - zoneStart, height(), QBrush(m_zoneColor));
 
     // draw ruler
     p.setPen(palette().midlight().color());
@@ -294,14 +293,15 @@ void SmallRuler::paintEvent(QPaintEvent *e)
 
     // Draw seeking pointer
     if (m_lastSeekPosition != SEEK_INACTIVE && m_lastSeekPosition != m_cursorFramePosition) {
-	p.fillRect(m_lastSeekPosition * m_scale - 1, 0, 3, height(), palette().highlight());
+	p.fillRect(m_lastSeekPosition * m_scale - 1, 0, 3, height(), palette().linkVisited());
     }
 }
 
 void SmallRuler::updatePalette()
 {
     KSharedConfigPtr config = KSharedConfig::openConfig(KdenliveSettings::colortheme());
-    m_zoneBrush = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, config);
+    m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, config).brush(this).color();
+    m_zoneColor.setAlpha(180);
     updatePixmap();
 }
 
diff --git a/src/smallruler.h b/src/smallruler.h
index 30b0941..0453a8c 100644
--- a/src/smallruler.h
+++ b/src/smallruler.h
@@ -59,7 +59,7 @@ private:
     int m_maxval;
     int m_zoneStart;
     int m_zoneEnd;
-    KStatefulBrush m_zoneBrush;
+    QColor m_zoneColor;
     QList <CommentedTime> m_markers;
     QPixmap m_pixmap;
     Monitor *m_monitor;