From fd8116a9de638c6fd6a4f3d263dca2997e03f018 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 19 Jun 2020 02:36:09 +1000 Subject: [PATCH] slider: use ctrl to switch axes --- app/widget/slider/sliderladder.cpp | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/app/widget/slider/sliderladder.cpp b/app/widget/slider/sliderladder.cpp index 2c8e6128e..5a9c4d235 100644 --- a/app/widget/slider/sliderladder.cpp +++ b/app/widget/slider/sliderladder.cpp @@ -135,14 +135,11 @@ void SliderLadder::TimerUpdate() return; } - int y_threshold = fontMetrics().height() / 2; - - if (qAbs(y_mvmt) > qAbs(x_mvmt) - || qApp->keyboardModifiers() & Qt::ControlModifier) { + if (qApp->keyboardModifiers() & Qt::ControlModifier) { // Movement is vertical y_mobility_ += y_mvmt; - if (qAbs(y_mobility_) > y_threshold) { + if (qAbs(y_mobility_) > fontMetrics().height()) { int new_active_element; if (y_mvmt < 0) { @@ -165,15 +162,9 @@ void SliderLadder::TimerUpdate() y_mobility_ = 0; } } else { - // Movement is horizontal - emit DraggedByValue(x_mvmt , elements_.at(active_element_)->GetMultiplier()); + y_mobility_ = 0; - // Reduce Y mobility - if (y_mobility_ > 0) { - y_mobility_--; - } else if (y_mobility_ < 0) { - y_mobility_++; - } + emit DraggedByValue(x_mvmt + y_mvmt, elements_.at(active_element_)->GetMultiplier()); } }