Update monitor ruler cursor color when mouse hover for improved usability

diff --git a/src/keyframehelper.cpp b/src/keyframehelper.cpp
index 05012a123a4a89924621efa2a3a5a1cf3240b7b5..5a8de19714f64963e865660f93b519f231c32f1a 100644 (file)
--- a/src/keyframehelper.cpp
+++ b/src/keyframehelper.cpp
@@ -102,16 +102,27 @@ void KeyframeHelper::mousePressEvent(QMouseEvent * event)
     }
 }
 
+void KeyframeHelper::leaveEvent( QEvent * event )
+{
+    Q_UNUSED(event);
+    if (m_hoverKeyframe != -1) {
+        m_hoverKeyframe = -1;
+        update();
+    }
+}
+
 // virtual
 void KeyframeHelper::mouseMoveEvent(QMouseEvent * event)
 {
     int xPos = event->x() - margin;
     if (!m_drag) {
         int mousePos = qMax((int)(xPos / m_scale), 0);
-        if (qAbs(m_position * m_scale - xPos) < cursorWidth && event->y() >= m_lineHeight && event->y() < 17) {
+        if (qAbs(m_position * m_scale - xPos) < cursorWidth && event->y() >= m_lineHeight) {
             // Mouse over time cursor
-            m_hoverKeyframe = -2;
-            update();
+            if (m_hoverKeyframe != -2) {
+                m_hoverKeyframe = -2;
+                update();
+            }
             event->accept();
             return;
         }
@@ -280,7 +291,7 @@ void KeyframeHelper::paintEvent(QPaintEvent *e)
     const int cursor = margin + m_position * m_scale;
     pa.setPoints(3, cursor - cursorWidth, 16, cursor + cursorWidth, 16, cursor, 10);
     if (m_hoverKeyframe == -2)
-        p.setBrush(m_selected);
+        p.setBrush(palette().highlight());
     else
         p.setBrush(palette().dark().color());
     p.drawPolygon(pa);

diff --git a/src/keyframehelper.h b/src/keyframehelper.h
index 6a01bae9dd53d2196809982fc5d752f19b1ea71f..4e8d7afe01df890b0b96bd627274da0877c6fe99 100644 (file)
--- a/src/keyframehelper.h
+++ b/src/keyframehelper.h
@@ -42,6 +42,7 @@ protected:
     virtual void mouseMoveEvent(QMouseEvent * event);
     virtual void mouseReleaseEvent(QMouseEvent * event);
     virtual void mouseDoubleClickEvent(QMouseEvent * event);
+    virtual void leaveEvent( QEvent * event );
 
 private:
     Mlt::Geometry *m_geom;

diff --git a/src/smallruler.cpp b/src/smallruler.cpp
index bcf1893445ff004addb42ee7ba3855328e496a25..dce24f469c1299294d45ef41d24718abd556e7cb 100644 (file)
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -35,10 +35,13 @@ SmallRuler::SmallRuler(MonitorManager *manager, QWidget *parent) :
         ,m_scale(1)
         ,m_maxval(25)
         ,m_manager(manager)
+        ,m_overCursor(false)
 {
     m_zoneStart = 10;
     m_zoneEnd = 60;
-    m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color();
+    KSharedConfigPtr config = KSharedConfig::openConfig(KdenliveSettings::colortheme());
+    m_zoneBrush = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, config);
+
     setMouseTracking(true);
     setMinimumHeight(10);
 }
@@ -111,11 +114,35 @@ void SmallRuler::mousePressEvent(QMouseEvent * event)
     } else emit seekRenderer((int) pos);
 }
 
+void SmallRuler::leaveEvent( QEvent * event )
+{
+    Q_UNUSED(event);
+    if (m_overCursor) {
+        m_overCursor = false;
+        update();
+    }
+}
+
 // virtual
 void SmallRuler::mouseMoveEvent(QMouseEvent * event)
 {
     const int pos = event->x() / m_scale;
-    if (event->buttons() & Qt::LeftButton) emit seekRenderer((int) pos);
+    if (event->button() == Qt::NoButton) {
+        if (qAbs(pos * m_scale - m_cursorPosition) < 6) {
+            if (!m_overCursor) {
+                m_overCursor = true;
+                update();
+            }
+        }
+        else if (m_overCursor) {
+            m_overCursor = false;
+            update();
+        }
+    }
+    if (event->buttons() & Qt::LeftButton) {
+        m_overCursor = true;
+        emit seekRenderer((int) pos);
+    }
     else {
         if (qAbs((pos - m_zoneStart) * m_scale) < 4) {
             setToolTip(i18n("Zone start: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneStart)));
@@ -160,7 +187,9 @@ void SmallRuler::updatePixmap()
 
     const int zoneStart = (int)(m_zoneStart * m_scale);
     const int zoneEnd = (int)(m_zoneEnd * m_scale);
-    p.fillRect(zoneStart, height() / 2 - 1, zoneEnd - zoneStart, height() / 2, m_zoneColor);
+    p.setPen(Qt::NoPen);
+    p.setBrush(m_zoneBrush.brush(this));
+    p.drawRect(zoneStart, height() / 2 - 1, zoneEnd - zoneStart, height() / 2);
 
     // draw ruler
     p.setPen(palette().text().color());
@@ -197,8 +226,9 @@ void SmallRuler::paintEvent(QPaintEvent *e)
 
     // draw pointer
     QPolygon pa(3);
-    pa.setPoints(3, m_cursorPosition - 5, 10, m_cursorPosition + 5, 10, m_cursorPosition/*+0*/, 5);
-    p.setBrush(palette().text().color());
+    pa.setPoints(3, m_cursorPosition - 6, 10, m_cursorPosition + 6, 10, m_cursorPosition/*+0*/, 4);
+    if (m_overCursor) p.setBrush(palette().highlight());
+    else p.setBrush(palette().text().color());
     p.setPen(Qt::NoPen);
     p.drawPolygon(pa);
 }

diff --git a/src/smallruler.h b/src/smallruler.h
index 621ce75120ec013b8aabd5f808f46ed8c009e1bd..9d71758870b908a21eca1b14ef18983607e1381d 100644 (file)
--- a/src/smallruler.h
+++ b/src/smallruler.h
@@ -21,10 +21,12 @@
 #ifndef SMALLRULER_H
 #define SMALLRULER_H
 
+#include <KColorScheme>
 #include <QWidget>
 
 #include "monitormanager.h"
 
+
 class SmallRuler : public QWidget
 {
     Q_OBJECT
@@ -33,6 +35,7 @@ public:
     SmallRuler(MonitorManager *manager, QWidget *parent = 0);
     virtual void mousePressEvent(QMouseEvent * event);
     virtual void mouseMoveEvent(QMouseEvent * event);
+    virtual void leaveEvent( QEvent * event );
     void adjustScale(int maximum);
     void setZone(int start, int end);
     QPoint zone();
@@ -52,10 +55,12 @@ private:
     int m_maxval;
     int m_zoneStart;
     int m_zoneEnd;
-    QColor m_zoneColor;
+    KStatefulBrush m_zoneBrush;
     QList <int> m_markers;
     QPixmap m_pixmap;
     MonitorManager *m_manager;
+    /** @brief True is mouse is over the ruler cursor. */
+    bool m_overCursor;
     void updatePixmap();
 
 public slots: