From 1fa3df342e1a9561ca82356ac1fb7e3ad81256b0 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Tue, 11 Sep 2012 09:24:51 +0200
Subject: [PATCH] Cleanup monitor ruler painting

---
 src/smallruler.cpp | 40 +++++++---------------------------------
 src/smallruler.h   |  3 ---
 2 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/src/smallruler.cpp b/src/smallruler.cpp
index d5f0a3ef..0b0ac1d6 100644
--- a/src/smallruler.cpp
+++ b/src/smallruler.cpp
@@ -38,7 +38,6 @@ SmallRuler::SmallRuler(MonitorManager *manager, Render *render, QWidget *parent)
         ,m_maxval(25)
         ,m_manager(manager)
 	,m_render(render)
-        ,m_overCursor(false)
 {
     m_zoneStart = 10;
     m_zoneEnd = 60;
@@ -133,33 +132,12 @@ void SmallRuler::mousePressEvent(QMouseEvent * event)
     }
 }
 
-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->button() == Qt::NoButton) {
-        if (qAbs(pos * m_scale - m_render->seekFramePosition()) < 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);
 	update();
     }
@@ -241,23 +219,19 @@ void SmallRuler::paintEvent(QPaintEvent *e)
     p.setClipRect(r);
     p.drawPixmap(QPointF(), m_pixmap);
 
-    int seekPos;
     int cursorPos = m_render->seekFramePosition() * m_scale;
-    if (m_render->requestedSeekPosition != SEEK_INACTIVE) {
-	seekPos = m_render->requestedSeekPosition * m_scale - 1;
-    }
-    else seekPos =  cursorPos - 1;
-
-    // Draw seeking pointer
-    p.fillRect(seekPos, 0, 3, height(), palette().text());
-
     // draw pointer
     QPolygon pa(3);
     pa.setPoints(3, cursorPos - 6, 10, cursorPos + 6, 10, cursorPos/*+0*/, 4);
-    if (m_overCursor) p.setBrush(palette().highlight());
-    else p.setBrush(palette().text().color());
+    p.setBrush(palette().text());
     p.setPen(Qt::NoPen);
     p.drawPolygon(pa);
+
+    // Draw seeking pointer
+    if (m_render->requestedSeekPosition != SEEK_INACTIVE) {
+	int seekPos = m_render->requestedSeekPosition * m_scale - 1;
+	p.fillRect(seekPos, 0, 3, height(), palette().highlight());
+    }
 }
 
 void SmallRuler::updatePalette()
diff --git a/src/smallruler.h b/src/smallruler.h
index bbf033a6..c37aa3e8 100644
--- a/src/smallruler.h
+++ b/src/smallruler.h
@@ -35,7 +35,6 @@ public:
     explicit SmallRuler(MonitorManager *manager, Render *render, 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);
     void setZoneStart();
@@ -62,8 +61,6 @@ private:
     QPixmap m_pixmap;
     MonitorManager *m_manager;
     Render *m_render;
-    /** @brief True is mouse is over the ruler cursor. */
-    bool m_overCursor;
     void updatePixmap();
 
 public slots:
-- 
2.39.2