X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.cpp;h=92141986ce4cc17f2a468c65928083468aaec1a6;hb=2347054c6d402d354eabfc3b4c9b12651db7c073;hp=e0c262511aaa98694f18723f5cd7d95a201b7209;hpb=66a3c7d1c9ad347b9b5eebc0f80b3e7fef35c13d;p=kdenlive diff --git a/src/customruler.cpp b/src/customruler.cpp index e0c26251..92141986 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -59,7 +59,8 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : m_lastSeekPosition(SEEK_INACTIVE), m_clickedGuide(-1), m_rate(-1), - m_mouseMove(NO_MOVE) + m_mouseMove(NO_MOVE), + m_cursorColor(palette().text()) { setFont(KGlobalSettings::toolBarFont()); QFontMetricsF fontMetrics(font()); @@ -74,7 +75,8 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : LITTLE_MARK_X = BIG_MARK_X + mark_length / 3; updateFrameSize(); m_scale = 3; - m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color(); + 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); @@ -93,7 +95,8 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : void CustomRuler::updatePalette() { - m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color(); + m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color(); + m_zoneColor.setAlpha(180); } void CustomRuler::updateProjectFps(Timecode t) @@ -164,7 +167,7 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) m_moveCursor = RULER_CURSOR; if (event->y() > 10) { 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_zoneStart + (m_zoneEnd - m_zoneStart) / 2.0) * m_factor) < 4) m_moveCursor = RULER_MIDDLE; else if (qAbs(pos - m_zoneEnd * m_factor) < 4) m_moveCursor = RULER_END; m_view->updateSnapPoints(NULL); } @@ -189,22 +192,24 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) if (m_moveCursor == RULER_CURSOR) { QPoint diff = event->pos() - m_clickPoint; if (m_mouseMove == NO_MOVE) { - if (!KdenliveSettings::verticalzoom() || qAbs(diff.x()) >= QApplication::startDragDistance()) { + if (qAbs(diff.x()) >= QApplication::startDragDistance()) { m_mouseMove = HORIZONTAL_MOVE; - } else if (qAbs(diff.y()) >= QApplication::startDragDistance()) { + } else if (KdenliveSettings::verticalzoom() && qAbs(diff.y()) >= QApplication::startDragDistance()) { m_mouseMove = VERTICAL_MOVE; } else return; } if (m_mouseMove == HORIZONTAL_MOVE) { - m_view->seekCursorPos(pos); - m_view->slotCheckPositionScrolling(); + if (pos != m_lastSeekPosition && pos != m_view->cursorPos()) { + m_view->seekCursorPos(pos); + m_view->slotCheckPositionScrolling(); + } } else { int verticalDiff = m_startRate - (diff.y()) / 7; if (verticalDiff != m_rate) emit adjustZoom(verticalDiff); } return; - } else if (m_moveCursor == RULER_START) m_zoneStart = pos; - else if (m_moveCursor == RULER_END) m_zoneEnd = pos; + } else if (m_moveCursor == RULER_START) m_zoneStart = qMin(pos, m_zoneEnd - 1); + else if (m_moveCursor == RULER_END) m_zoneEnd = qMax(pos, m_zoneStart + 1); else if (m_moveCursor == RULER_MIDDLE) { int move = pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2); if (move + m_zoneStart < 0) move = - m_zoneStart; @@ -216,7 +221,17 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) update(min * m_factor - m_offset - 2, 0, (max - min) * m_factor + 4, height()); } else { - int pos = (int)((event->x() + offset())); + 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().link(); + update(m_view->cursorPos() * m_factor - m_offset - 10, LABEL_SIZE + 2, 20, MAX_HEIGHT - LABEL_SIZE - 2); + } + 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); + } + if (event->y() <= 10) setCursor(Qt::ArrowCursor); else if (qAbs(pos - m_zoneStart * m_factor) < 4) { setCursor(KCursor("left_side", Qt::SizeHorCursor)); @@ -226,7 +241,7 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) setCursor(KCursor("right_side", Qt::SizeHorCursor)); if (KdenliveSettings::frametimecode()) setToolTip(i18n("Zone end: %1", m_zoneEnd)); else setToolTip(i18n("Zone end: %1", m_timecode.getTimecodeFromFrames(m_zoneEnd))); - } else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * m_factor) < 4) { + } else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2.0) * m_factor) < 4) { setCursor(Qt::SizeHorCursor); if (KdenliveSettings::frametimecode()) setToolTip(i18n("Zone duration: %1", m_zoneEnd - m_zoneStart)); else setToolTip(i18n("Zone duration: %1", m_timecode.getTimecodeFromFrames(m_zoneEnd - m_zoneStart))); @@ -239,6 +254,16 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) } +// virtual +void CustomRuler::leaveEvent(QEvent * event) +{ + QWidget::leaveEvent(event); + if (m_cursorColor == palette().link()) { + m_cursorColor = palette().text(); + update(); + } +} + // virtual void CustomRuler::wheelEvent(QWheelEvent * e) { @@ -271,10 +296,18 @@ int CustomRuler::offset() const void CustomRuler::slotCursorMoved(int oldpos, int newpos) { - if (qAbs(oldpos - newpos) * m_factor > m_textSpacing) { - update(oldpos * m_factor - offset() - 6, BIG_MARK_X, 14, MAX_HEIGHT - BIG_MARK_X); - update(newpos * m_factor - offset() - 6, BIG_MARK_X, 14, MAX_HEIGHT - BIG_MARK_X); - } else update(qMin(oldpos, newpos) * m_factor - offset() - 6, BIG_MARK_X, qAbs(oldpos - newpos) * m_factor + 14, MAX_HEIGHT - BIG_MARK_X); + int min = qMin(oldpos, newpos); + int max = qMax(oldpos, newpos); + if (m_lastSeekPosition != SEEK_INACTIVE) { + if (m_lastSeekPosition == newpos) { + m_lastSeekPosition = SEEK_INACTIVE; + } + else { + min = qMin(min, m_lastSeekPosition); + max = qMax(max, m_lastSeekPosition); + } + } + update(min * m_factor - m_offset - 6, BIG_MARK_X, (max - min) * m_factor + 14, MAX_HEIGHT - BIG_MARK_X); } void CustomRuler::updateRuler() @@ -402,7 +435,7 @@ void CustomRuler::paintEvent(QPaintEvent *e) p.drawText(f - m_offset + 2, LABEL_SIZE, lab); } } - + p.setPen(palette().dark().color()); offsetmin = (paintRect.left() + m_offset) / littleMarkDistance; offsetmin = offsetmin * littleMarkDistance; // draw the little marks @@ -452,13 +485,13 @@ void CustomRuler::paintEvent(QPaintEvent *e) // draw pointer const int value = m_view->cursorPos() * m_factor - m_offset; QPolygon pa(3); - pa.setPoints(3, value - 6, BIG_MARK_X, value + 6, BIG_MARK_X, value, MAX_HEIGHT - 1); - p.setBrush(palette().text()); + pa.setPoints(3, value - 6, LABEL_SIZE + 3, value + 6, LABEL_SIZE + 3, value, MAX_HEIGHT); + p.setBrush(m_cursorColor); p.setPen(Qt::NoPen); p.drawPolygon(pa); - if (m_lastSeekPosition != SEEK_INACTIVE) { - p.fillRect(m_lastSeekPosition * m_factor - m_offset - 1, BIG_MARK_X, 3, MAX_HEIGHT - 1, palette().highlight()); + 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().linkVisited()); } }