diff options
| author | Be <be@mixxx.org> | 2019-11-20 20:57:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-20 20:57:15 -0600 |
| commit | 35da91b786eb7979d4cacf1c7e650978c33ea499 (patch) | |
| tree | 8141114976665c20f477577c462d70dc8f4d5f93 /src/widget/woverview.h | |
| parent | 7b1f4d106b14b5be9bee1a2e3d192c07a5ec5055 (diff) | |
| parent | 7c699b7b69cfb661d51018ebdfeb7720e52bd506 (diff) | |
Merge pull request #2353 from daschuer/lp1850644
Lp1850644: Restore slider nature of WOverview
Diffstat (limited to 'src/widget/woverview.h')
| -rw-r--r-- | src/widget/woverview.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/widget/woverview.h b/src/widget/woverview.h index d5bcc4792a..583b7d132e 100644 --- a/src/widget/woverview.h +++ b/src/widget/woverview.h @@ -57,12 +57,12 @@ class WOverview : public WWidget, public TrackDropTarget { UserSettingsPointer pConfig, QWidget* parent = nullptr); - void mouseMoveEvent(QMouseEvent *e) override; - void mouseReleaseEvent(QMouseEvent *e) override; - void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent* e) override; + void mouseReleaseEvent(QMouseEvent* e) override; + void mousePressEvent(QMouseEvent* e) override; void leaveEvent(QEvent* event) override; - void paintEvent(QPaintEvent * /*unused*/) override; - void resizeEvent(QResizeEvent * /*unused*/) override; + void paintEvent(QPaintEvent* /*unused*/) override; + void resizeEvent(QResizeEvent* /*unused*/) override; void dragEnterEvent(QDragEnterEvent* event) override; void dropEvent(QDropEvent* event) override; @@ -114,7 +114,7 @@ class WOverview : public WWidget, public TrackDropTarget { void drawAnalyzerProgress(QPainter* pPainter); void drawRangeMarks(QPainter* pPainter, const float& offset, const float& gain); void drawMarks(QPainter* pPainter, const float offset, const float gain); - void drawCurrentPosition(QPainter* pPainter); + void drawPickupPosition(QPainter* pPainter); void drawTimeRuler(QPainter* pPainter); void drawMarkLabels(QPainter* pPainter, const float offset, const float gain); void paintText(const QString& text, QPainter* pPainter); @@ -147,8 +147,12 @@ class WOverview : public WWidget, public TrackDropTarget { bool m_bShowCueTimes; int m_iPosSeconds; + // True if pick-up is dragged. Only used when m_bEventWhileDrag is false + bool m_bLeftClickDragging; // Internal storage of slider position in pixels - int m_iPos; + int m_iPickupPos; + // position of the overlay shaddow + int m_iPlayPos; WaveformMarkPointer m_pHoveredMark; bool m_bHotcueMenuShowing; @@ -167,7 +171,6 @@ class WOverview : public WWidget, public TrackDropTarget { QColor m_labelBackgroundColor; QColor m_endOfTrackColor; - PredefinedColorsRepresentation m_predefinedColorsRepresentation; // All WaveformMarks WaveformMarkSet m_marks; // List of visible WaveformMarks sorted by the order they appear in the track |