Fix warnings

This commit is contained in:
2023-12-20 11:31:08 +01:00
parent eaf2c7094b
commit e5be04926b
2 changed files with 25 additions and 19 deletions
+18 -16
View File
@@ -105,43 +105,44 @@ void STFSlider::paintEvent(QPaintEvent *event)
void STFSlider::mouseMoveEvent(QMouseEvent *event)
{
if(std::abs(m_blackPoint*width() - event->x()) < 5 ||
std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - event->x()) < 5 ||
std::abs(m_whitePoint*width() - event->x()) < 5)
const qreal x = event->position().x();
if(std::abs(m_blackPoint*width() - x) < 5 ||
std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - x) < 5 ||
std::abs(m_whitePoint*width() - x) < 5)
setCursor(Qt::SplitHCursor);
else
unsetCursor();
qreal x = (qreal)event->x()/width();
qreal xw = x/width();
if(event->modifiers() & Qt::ShiftModifier && !m_fineTune)
{
m_fineTune = true;
m_fineTuneX = x;
m_fineTuneX = xw;
}
if(!(event->modifiers() & Qt::ShiftModifier) && m_fineTune)
m_fineTune = false;
if(m_fineTune)
{
x = m_fineTuneX + (x - m_fineTuneX) * 0.2;
xw = m_fineTuneX + (xw - m_fineTuneX) * 0.2;
}
switch(m_grabbed)
{
case 0:
m_blackPoint = clamp(x);
m_blackPoint = clamp(xw);
m_whitePoint = std::max(m_whitePoint, m_blackPoint);
QToolTip::showText(event->globalPos(), QString::number(m_blackPoint), this);
QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_blackPoint), this);
break;
case 1:
m_midPoint = (x - m_blackPoint) / (m_whitePoint - m_blackPoint);
m_midPoint = (xw - m_blackPoint) / (m_whitePoint - m_blackPoint);
m_midPoint = clamp(m_midPoint);
QToolTip::showText(event->globalPos(), QString::number(m_midPoint), this);
QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_midPoint), this);
break;
case 2:
m_whitePoint = clamp(x);
m_whitePoint = clamp(xw);
m_blackPoint = std::min(m_blackPoint, m_whitePoint);
QToolTip::showText(event->globalPos(), QString::number(m_whitePoint), this);
QToolTip::showText(event->globalPosition().toPoint(), QString::number(m_whitePoint), this);
break;
}
if(m_grabbed >= 0)
@@ -153,17 +154,18 @@ void STFSlider::mouseMoveEvent(QMouseEvent *event)
void STFSlider::mousePressEvent(QMouseEvent *event)
{
const qreal x = event->position().x();
if(event->modifiers() & Qt::ShiftModifier)
{
m_fineTune = true;
m_fineTuneX = (qreal)event->x()/width();
m_fineTuneX = x/width();
}
if(std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - event->x()) < 5)
if(std::abs((m_blackPoint + (m_whitePoint - m_blackPoint) * m_midPoint)*width() - x) < 5)
m_grabbed = 1;
else if(std::abs(m_blackPoint*width() - event->x()) < 5)
else if(std::abs(m_blackPoint*width() - x) < 5)
m_grabbed = 0;
else if(std::abs(m_whitePoint*width() - event->x()) < 5)
else if(std::abs(m_whitePoint*width() - x) < 5)
m_grabbed = 2;
else
m_grabbed = -1;