AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix RollEffect misplacements in High DPI setups

Browse Source 
Pass the correct screen as parent of the roll effect widget.

Fixes: QTBUG-82011
Change-Id: I25c163cb2e4c038e60ceced702a1ea6c18aa5424
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
This commit is contained in:
Friedemann Kleint 2020-02-11 09:44:35 +01:00
parent 57af7f2166
commit 045a143c2c
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/widgets/widgets/qeffects.cpp
View File

@ -54,6 +54,15 @@
QT_BEGIN_NAMESPACE
static QWidget *effectParent(const QWidget* w)
{
const int screenNumber = w ? QGuiApplication::screens().indexOf(w->screen()) : 0;
QT_WARNING_PUSH // ### Qt 6: Find a replacement for QDesktopWidget::screen()
QT_WARNING_DISABLE_DEPRECATED
return QApplication::desktop()->screen(screenNumber);
QT_WARNING_POP
}
/*
Internal class QAlphaWidget.
@ -98,12 +107,9 @@ static QAlphaWidget* q_blend = 0;
/*
Constructs a QAlphaWidget.
*/
QT_WARNING_PUSH
QT_WARNING_DISABLE_DEPRECATED // ### Qt 6: Find a replacement for QDesktopWidget::screen()
QAlphaWidget::QAlphaWidget(QWidget* w, Qt::WindowFlags f)
: QWidget(QApplication::desktop()->screen(QDesktopWidgetPrivate::screenNumber(w)), f)
: QWidget(effectParent(w), f)
{
QT_WARNING_POP
#ifndef Q_OS_WIN
setEnabled(false);
#endif
@ -383,7 +389,7 @@ static QRollEffect* q_roll = 0;
Construct a QRollEffect widget.
*/
QRollEffect::QRollEffect(QWidget* w, Qt::WindowFlags f, DirFlags orient)
: QWidget(0, f), orientation(orient)
: QWidget(effectParent(w), f), orientation(orient)
{
#ifndef Q_OS_WIN
setEnabled(false);