dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix volume slider regression

Browse Source
This commit is contained in:
Jonas Kvinge
2021-06-21 20:21:40 +02:00
parent d4f10c61ef
commit 8572e3eabb
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/widgets/volumeslider.cpp
View File

@@ -181,7 +181,7 @@ void PrettySlider::mousePressEvent(QMouseEvent *e) {
void PrettySlider::slideEvent(QMouseEvent *e) { void PrettySlider::slideEvent(QMouseEvent *e) {
if (m_mode == Pretty) { if (m_mode == Pretty) {
SliderSlider::setValue(orientation() == Qt::Horizontal ? QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().x(), width() - 2) : QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().y(), height() - 2)); QSlider::setValue(orientation() == Qt::Horizontal ? QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().x(), width() - 2) : QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().y(), height() - 2)); // clazy:exclude=skipped-base-method
} }
else { else {
SliderSlider::slideEvent(e); SliderSlider::slideEvent(e);
@@ -302,20 +302,20 @@ void VolumeSlider::contextMenuEvent(QContextMenuEvent *e) {
QAction *ret = menu.exec(mapToGlobal(e->pos())); QAction *ret = menu.exec(mapToGlobal(e->pos()));
if (ret) { if (ret) {
SliderSlider::setValue(values[ret]); QSlider::setValue(values[ret]); // clazy:exclude=skipped-base-method
emit sliderReleased(values[ret]); emit sliderReleased(values[ret]);
} }
} }
void VolumeSlider::slideEvent(QMouseEvent *e) { void VolumeSlider::slideEvent(QMouseEvent *e) {
SliderSlider::setValue(QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().x(), width() - 2)); QSlider::setValue(QStyle::sliderValueFromPosition(minimum(), maximum(), e->pos().x(), width() - 2)); // clazy:exclude=skipped-base-method
} }
void VolumeSlider::wheelEvent(QWheelEvent *e) { void VolumeSlider::wheelEvent(QWheelEvent *e) {
const uint step = e->angleDelta().y() / (e->angleDelta().x() == 0 ? 30 : -30); const uint step = e->angleDelta().y() / (e->angleDelta().x() == 0 ? 30 : -30);
SliderSlider::setValue(SliderSlider::value() + step); QSlider::setValue(SliderSlider::value() + step); // clazy:exclude=skipped-base-method
emit sliderReleased(value()); emit sliderReleased(value());
} }