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

8
src/osd/osdpretty.cpp
View File

@@ -439,12 +439,16 @@ void OSDPretty::Reposition() {
#endif
}
void OSDPretty::enterEvent(QEvent *) {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void OSDPretty::enterEvent(QEnterEvent*) {
#else
void OSDPretty::enterEvent(QEvent*) {
#endif
if (mode_ == Mode_Popup)
setWindowOpacity(0.25);
}
void OSDPretty::leaveEvent(QEvent *) {
void OSDPretty::leaveEvent(QEvent*) {
setWindowOpacity(1.0);
}

9
src/osd/osdpretty.h
View File

@@ -44,6 +44,7 @@ class QEvent;
class QMouseEvent;
class QPaintEvent;
class QShowEvent;
class QEnterEvent;
class Ui_OSDPretty;
@@ -115,8 +116,12 @@ class OSDPretty : public QWidget {
protected:
void paintEvent(QPaintEvent *e) override;
void enterEvent(QEvent *e) override;
void leaveEvent(QEvent *e) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
void enterEvent(QEnterEvent*) override;
#else
void enterEvent(QEvent*) override;
#endif
void leaveEvent(QEvent*) override;
void mousePressEvent(QMouseEvent *e) override;
void showEvent(QShowEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override;