hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix logarithmic behavior when dragging knobs and sliders (#7647)

Browse Source 
* Initial fix

* Remove stray m_leftOver reference

* Fix shift-dragging

* Revert to relative mouse control. I realize now that the maths don't actually change.

* Change qRound to std::round

* Fix scrolling behavior

* Fix mouse relative position buildup at values < minValue

* Use approximatelyEqual
This commit is contained in:
regulus79
2025-02-28 17:02:52 -05:00
committed by GitHub
parent a4c91f8ba0
commit cf4b492292
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/gui/widgets/FloatModelEditorBase.cpp
View File

@@ -329,7 +329,10 @@ void FloatModelEditorBase::wheelEvent(QWheelEvent * we)
}
// Compute the number of steps but make sure that we always do at least one step
const float stepMult = std::max(range / numberOfStepsForFullSweep / step, 1.f);
const float currentValue = model()->value();
const float valueOffset = range / numberOfStepsForFullSweep;
const float scaledValueOffset = model()->scaledValue(model()->inverseScaledValue(currentValue) + valueOffset) - currentValue;
const float stepMult = std::max(scaledValueOffset / step, 1.f);
const int inc = direction * stepMult;
model()->incValue(inc);
@@ -343,40 +346,26 @@ void FloatModelEditorBase::wheelEvent(QWheelEvent * we)
void FloatModelEditorBase::setPosition(const QPoint & p)
{
const float value = getValue(p) + m_leftOver;
const float valueOffset = getValue(p) + m_leftOver;
const float currentValue = model()->value();
const float scaledValueOffset = currentValue - model()->scaledValue(model()->inverseScaledValue(currentValue) - valueOffset);
const auto step = model()->step<float>();
const float oldValue = model()->value();
const float roundedValue = std::round((currentValue - scaledValueOffset) / step) * step;
if (model()->isScaleLogarithmic()) // logarithmic code
if (!approximatelyEqual(roundedValue, currentValue))
{
const float pos = model()->minValue() < 0
? oldValue / qMax(qAbs(model()->maxValue()), qAbs(model()->minValue()))
: (oldValue - model()->minValue()) / model()->range();
const float ratio = 0.1f + qAbs(pos) * 15.f;
float newValue = value * ratio;
if (qAbs(newValue) >= step)
{
float roundedValue = qRound((oldValue - value) / step) * step;
model()->setValue(roundedValue);
m_leftOver = 0.0f;
}
else
{
m_leftOver = value;
}
model()->setValue(roundedValue);
m_leftOver = 0.0f;
}
else // linear code
else
{
if (qAbs(value) >= step)
if (valueOffset > 0 && approximatelyEqual(currentValue, model()->minValue()))
{
float roundedValue = qRound((oldValue - value) / step) * step;
model()->setValue(roundedValue);
m_leftOver = 0.0f;
}
else
{
m_leftOver = value;
m_leftOver = valueOffset;
}
}
}