summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2019-11-11 23:05:52 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2019-11-21 08:20:54 +0100
commit90c85f579ff91f6766ae0b309d3a66f53b2f5bd6 (patch)
treec140c063627afc7cc6180d4b567eacfaeb2609ef /src
parent356e7116e6f55977c90ba205783e120bc1b7b2be (diff)
rename m_bDrag to m_bLeftClickDragging
Diffstat (limited to 'src')
-rw-r--r--src/widget/woverview.cpp22
-rw-r--r--src/widget/woverview.h2
2 files changed, 12 insertions, 12 deletions
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 70171d5afa..588c2ae3a4 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -57,7 +57,7 @@ WOverview::WOverview(
m_pCueMenu(std::make_unique<CueMenu>(this)),
m_bShowCueTimes(true),
m_iPosSeconds(0),
- m_bDrag(false),
+ m_bLeftClickDragging(false),
m_iPos(0),
m_pHoveredMark(nullptr),
m_bHotcueMenuShowing(false),
@@ -205,7 +205,7 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
void WOverview::onConnectedControlChanged(double dParameter, double dValue) {
// this is connected via skin to "playposition"
Q_UNUSED(dValue);
- if (m_bDrag) {
+ if (m_bLeftClickDragging) {
// don't move slider under the mouse
return;
}
@@ -386,7 +386,7 @@ void WOverview::receiveCuesUpdated() {
}
void WOverview::mouseMoveEvent(QMouseEvent* e) {
- if (m_bDrag) {
+ if (m_bLeftClickDragging) {
if (m_orientation == Qt::Horizontal) {
m_iPos = math_clamp(e->x(), 0, width() - 1);
} else {
@@ -441,10 +441,10 @@ void WOverview::mouseReleaseEvent(QMouseEvent* e) {
//qDebug() << "WOverview::mouseReleaseEvent" << e->pos() << m_iPos << ">>" << dValue;
if (e->button() == Qt::LeftButton) {
- if (m_bDrag) {
+ if (m_bLeftClickDragging) {
double dValue = positionToValue(m_iPos);
setControlParameterUp(dValue);
- m_bDrag = false;
+ m_bLeftClickDragging = false;
}
m_bTimeRulerActive = false;
} else if (e->button() == Qt::RightButton) {
@@ -472,15 +472,15 @@ void WOverview::mousePressEvent(QMouseEvent* e) {
dValue = m_pHoveredMark->getSamplePosition() / m_trackSamplesControl->get();
m_iPos = valueToPosition(dValue);
setControlParameterUp(dValue);
- m_bDrag = false;
+ m_bLeftClickDragging = false;
} else {
- m_bDrag = true;
+ m_bLeftClickDragging = true;
m_bTimeRulerActive = true;
}
} else if (e->button() == Qt::RightButton) {
- if (m_bDrag) {
+ if (m_bLeftClickDragging) {
m_iPos = valueToPosition(m_playpositionControl->get());
- m_bDrag = false;
+ m_bLeftClickDragging = false;
m_bTimeRulerActive = false;
} else if (m_pHoveredMark == nullptr) {
m_bTimeRulerActive = true;
@@ -520,7 +520,7 @@ void WOverview::leaveEvent(QEvent* e) {
if (!m_bHotcueMenuShowing) {
m_pHoveredMark.clear();
}
- m_bDrag = false;
+ m_bLeftClickDragging = false;
m_bTimeRulerActive = false;
update();
}
@@ -911,7 +911,7 @@ void WOverview::drawTimeRuler(QPainter* pPainter) {
QPen shadowPen(Qt::black, 2.5 * m_scaleFactor);
if (m_bTimeRulerActive) {
- if (!m_bDrag) {
+ if (!m_bLeftClickDragging) {
QLineF line;
if (m_orientation == Qt::Horizontal) {
line.setLine(m_timeRulerPos.x(), 0.0, m_timeRulerPos.x(), height());
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index 4dfe478bfe..d4eace7831 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -148,7 +148,7 @@ class WOverview : public WWidget, public TrackDropTarget {
// True if slider is dragged. Only used when m_bEventWhileDrag is false
int m_iPosSeconds;
- bool m_bDrag;
+ bool m_bLeftClickDragging;
// Internal storage of slider position in pixels
int m_iPos;