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-11 23:05:52 +0100
commit124e7cfed86b3df2986b21e38350b4b11884af05 (patch)
tree82764658667fed149dd971dabb8d539ac5abbb67 /src
parent66a67efaa6dc27e9e054d0dcc41226a566317f8c (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 bb1ca27a82..d3b3fb5c04 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),
@@ -203,7 +203,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;
}
@@ -384,7 +384,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 {
@@ -439,10 +439,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) {
@@ -470,15 +470,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;
@@ -518,7 +518,7 @@ void WOverview::leaveEvent(QEvent* e) {
if (!m_bHotcueMenuShowing) {
m_pHoveredMark.clear();
}
- m_bDrag = false;
+ m_bLeftClickDragging = false;
m_bTimeRulerActive = false;
update();
}
@@ -909,7 +909,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 e39dc16dd5..63eba9de13 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;