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

Fix QWidget::enterEvent with Qt 6

Browse Source
This commit is contained in:
Jonas Kvinge
2020-09-05 19:20:43 +02:00
parent 31dd910289
commit 73692797dc
8 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/widgets/tracksliderslider.cpp
View File

@@ -30,6 +30,7 @@
#include <QKeyEvent>
#include <QMouseEvent>
#include <QWheelEvent>
# include <QEnterEvent>
#include "core/timeconstants.h"
#include "core/utilities.h"
@@ -120,7 +121,11 @@ void TrackSliderSlider::wheelEvent(QWheelEvent *e) {
}
void TrackSliderSlider::enterEvent(QEvent* e) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void TrackSliderSlider::enterEvent(QEnterEvent *e) {
#else
void TrackSliderSlider::enterEvent(QEvent *e) {
#endif
QSlider::enterEvent(e);
#ifndef Q_OS_MACOS
if (isEnabled()) {
@@ -129,7 +134,7 @@ void TrackSliderSlider::enterEvent(QEvent* e) {
#endif
}
void TrackSliderSlider::leaveEvent(QEvent* e) {
void TrackSliderSlider::leaveEvent(QEvent *e) {
QSlider::leaveEvent(e);
#ifndef Q_OS_MACOS
if (popup_->isVisible()) {
@@ -138,7 +143,7 @@ void TrackSliderSlider::leaveEvent(QEvent* e) {
#endif
}
void TrackSliderSlider::keyPressEvent(QKeyEvent* event) {
void TrackSliderSlider::keyPressEvent(QKeyEvent *event) {
if (event->key() == Qt::Key_Left || event->key() == Qt::Key_Down) {
emit SeekBackward();
event->accept();

10
src/widgets/tracksliderslider.h
View File

@@ -32,6 +32,8 @@ class QEvent;
class QKeyEvent;
class QMouseEvent;
class QWheelEvent;
class QEnterEvent;
#ifndef Q_OS_MACOS
class TrackSliderPopup;
#endif
@@ -54,8 +56,12 @@ class TrackSliderSlider : public QSlider {
void mouseReleaseEvent(QMouseEvent* e) override;
void mouseMoveEvent(QMouseEvent* e) override;
void wheelEvent(QWheelEvent *e) override;
void enterEvent(QEvent*) override;
void leaveEvent(QEvent*) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent *e) override;
#else
void enterEvent(QEvent *e) override;
#endif
void leaveEvent(QEvent *e) override;
void keyPressEvent(QKeyEvent* event) override;
private slots:

4
src/widgets/volumeslider.cpp
View File

@@ -342,7 +342,11 @@ void VolumeSlider::paintEvent(QPaintEvent*) {
}
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void VolumeSlider::enterEvent(QEnterEvent*) {
#else
void VolumeSlider::enterEvent(QEvent*) {
#endif
m_animEnter = true;
m_animCount = 0;

5
src/widgets/volumeslider.h
View File

@@ -38,6 +38,7 @@ class QMouseEvent;
class QPaintEvent;
class QWheelEvent;
class QContextMenuEvent;
class QEnterEvent;
class SliderSlider : public QSlider {
Q_OBJECT
@@ -108,7 +109,11 @@ class VolumeSlider : public SliderSlider {
protected:
void paintEvent(QPaintEvent*) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent*) override;
#else
void enterEvent(QEvent*) override;
#endif
void leaveEvent(QEvent*) override;
virtual void paletteChange(const QPalette&);
void slideEvent(QMouseEvent*) override;