Small ui cleanup + possible crash fix in renderwidget

[kdenlive] / src / customruler.cpp

diff --git a/src/customruler.cpp b/src/customruler.cpp
index 8a9526931ae3517c81c02d8a61d9984e53c20e81..98baa6372c3f7a7f54af763bec936f393d40c9f6 100644 (file)
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -24,6 +24,7 @@
 #include <KIcon>
 #include <KCursor>
 #include <KGlobalSettings>
+#include <KColorScheme>
 
 #include <QApplication>
 #include <QMouseEvent>
@@ -67,7 +68,7 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) :
     QFontMetricsF fontMetrics(font());
     LABEL_SIZE = fontMetrics.ascent() - 2;
     m_scale = 3;
-    m_zoneColor = QColor(133, 255, 143);
+    m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color();
     littleMarkDistance = FRAME_SIZE;
     mediumMarkDistance = FRAME_SIZE * m_timecode.fps();
     bigMarkDistance = FRAME_SIZE * m_timecode.fps() * 60;
@@ -108,6 +109,7 @@ void CustomRuler::slotDeleteGuide()
 
 void CustomRuler::slotGoToGuide(QAction *act)
 {
+    m_view->setCursorPos(act->data().toInt(), true);
     m_view->initCursorPos(act->data().toInt());
 }
 
@@ -120,7 +122,12 @@ void CustomRuler::setZone(QPoint p)
 
 void CustomRuler::mouseReleaseEvent(QMouseEvent * /*event*/)
 {
+    if (m_moveCursor == RULER_START || m_moveCursor == RULER_END || m_moveCursor == RULER_MIDDLE) {
+        emit zoneMoved(m_zoneStart, m_zoneEnd);
+        m_view->setDocumentModified();
+    }
     m_mouseMove = NO_MOVE;
+
 }
 
 // virtual
@@ -142,6 +149,7 @@ void CustomRuler::mousePressEvent(QMouseEvent * event)
         if (qAbs(pos - m_zoneStart * m_factor) < 4) m_moveCursor = RULER_START;
         else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * m_factor) < 4) m_moveCursor = RULER_MIDDLE;
         else if (qAbs(pos - m_zoneEnd * m_factor) < 4) m_moveCursor = RULER_END;
+        m_view->updateSnapPoints(NULL);
     }
     if (m_moveCursor == RULER_CURSOR) {
         m_view->setCursorPos((int) pos / m_factor);
@@ -154,7 +162,10 @@ void CustomRuler::mousePressEvent(QMouseEvent * event)
 void CustomRuler::mouseMoveEvent(QMouseEvent * event)
 {
     if (event->buttons() == Qt::LeftButton) {
-        int pos = (int)((event->x() + offset()) / m_factor);
+        int pos;
+        if (m_moveCursor == RULER_START || m_moveCursor == RULER_END) {
+            pos = m_view->getSnapPointForPos((int)((event->x() + offset()) / m_factor));
+        } else pos = (int)((event->x() + offset()) / m_factor);
         int zoneStart = m_zoneStart;
         int zoneEnd = m_zoneEnd;
         if (pos < 0) pos = 0;
@@ -183,8 +194,6 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event)
             m_zoneStart += move;
             m_zoneEnd += move;
         }
-        emit zoneMoved(m_zoneStart, m_zoneEnd);
-        m_view->setDocumentModified();
 
         int min = qMin(m_zoneStart, zoneStart);
         int max = qMax(m_zoneEnd, zoneEnd);
@@ -341,7 +350,7 @@ void CustomRuler::paintEvent(QPaintEvent *e)
     double f, fend;
     const int offsetmax = maxval * FRAME_SIZE;
 
-    p.setPen(palette().dark().color());
+    p.setPen(palette().text().color());
 
     // draw time labels
     int offsetmin = (e->rect().left() + m_offset) / m_textSpacing;