1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows QPA: Do not call EnableNonClientDpiScaling() on Desktop GL Windows

Browse Source 
It causes artifacts when moving the windows between monitors.
Amends e8ecde99df8dc8959e1a5af679961cb946ccae69.

Task-number: QTBUG-53255
Task-number: QTBUG-62901
Change-Id: Ia8b0f760370887a75efa05bc9736075afebfe069
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Friedemann Kleint 2017-09-05 08:55:58 +02:00
parent e29b72384b
commit 9d8a4d16c6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/platforms/windows/qwindowscontext.cpp
View File

@ -64,6 +64,7 @@
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <qpa/qplatformnativeinterface.h> #include <qpa/qplatformnativeinterface.h>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
#include <QtGui/QOpenGLContext>
#include <QtCore/QSet> #include <QtCore/QSet>
#include <QtCore/QHash> #include <QtCore/QHash>
@ -845,6 +846,18 @@ static inline bool resizeOnDpiChanged(const QWindow *w)
return result; return result;
} }
static bool shouldHaveNonClientDpiScaling(const QWindow *window)
{
return QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10
&& window->isTopLevel()
&& !window->property(QWindowsWindow::embeddedNativeParentHandleProperty).isValid()
#if QT_CONFIG(opengl) // /QTBUG-62901, EnableNonClientDpiScaling has problems with GL
&& (window->surfaceType() != QSurface::OpenGLSurface
|| QOpenGLContext::openGLModuleType() != QOpenGLContext::LibGL)
#endif
;
}
/*! /*!
\brief Main windows procedure registered for windows. \brief Main windows procedure registered for windows.
@ -970,10 +983,8 @@ bool QWindowsContext::windowsProc(HWND hwnd, UINT message,
d->m_creationContext->obtainedGeometry.moveTo(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)); d->m_creationContext->obtainedGeometry.moveTo(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam));
return true; return true;
case QtWindows::NonClientCreate: case QtWindows::NonClientCreate:
if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10 && d->m_creationContext->window->isTopLevel() if (shouldHaveNonClientDpiScaling(d->m_creationContext->window))
&& !d->m_creationContext->window->property(QWindowsWindow::embeddedNativeParentHandleProperty).isValid()) {
enableNonClientDpiScaling(msg.hwnd); enableNonClientDpiScaling(msg.hwnd);
}
return false; return false;
case QtWindows::CalculateSize: case QtWindows::CalculateSize:
return QWindowsGeometryHint::handleCalculateSize(d->m_creationContext->customMargins, msg, result); return QWindowsGeometryHint::handleCalculateSize(d->m_creationContext->customMargins, msg, result);