Disable zoom using vertical mouse drag in ruler by default:

[kdenlive] / src / customruler.cpp

diff --git a/src/customruler.cpp b/src/customruler.cpp
index 0d4eef4ebc849fad63ffc893c7b271b46b12623d..c01a0fe310a57d1c89e53328e79c7b8d705ccd93 100644 (file)
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "customruler.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
 #include <KIcon>
@@ -105,14 +106,12 @@ void CustomRuler::slotDeleteGuide()
 
 void CustomRuler::setZone(QPoint p)
 {
-    int min = qMin(m_zoneStart, p.x());
-    int max = qMax(m_zoneEnd, p.y());
     m_zoneStart = p.x();
     m_zoneEnd = p.y();
-    update(min * m_factor - 2, 0, (max - min) * m_factor + 4, height());
+    update();
 }
 
-void CustomRuler::mouseReleaseEvent(QMouseEvent * event)
+void CustomRuler::mouseReleaseEvent(QMouseEvent * /*event*/)
 {
     m_mouseMove = NO_MOVE;
 }
@@ -154,7 +153,7 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event)
         if (m_moveCursor == RULER_CURSOR) {
             QPoint diff = event->pos() - m_clickPoint;
             if (m_mouseMove == NO_MOVE) {
-                if (qAbs(diff.x()) >= QApplication::startDragDistance()) {
+                if (!KdenliveSettings::verticalzoom() || qAbs(diff.x()) >= QApplication::startDragDistance()) {
                     m_mouseMove = HORIZONTAL_MOVE;
                 } else if (qAbs(diff.y()) >= QApplication::startDragDistance()) {
                     m_mouseMove = VERTICAL_MOVE;
@@ -197,7 +196,7 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event)
             setToolTip(i18n("Zone duration: %1", m_timecode.getTimecodeFromFrames(m_zoneEnd - m_zoneStart)));
         } else {
             setCursor(Qt::ArrowCursor);
-            setToolTip(QString());
+            setToolTip(i18n("Position: %1", m_timecode.getTimecodeFromFrames(pos / m_factor)));
         }
     }
 }