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

Revert "Windows QPA: Add MSWindowsNoRedirectionBitmap flag"

Browse Source 
This reverts commit 417bb463526d3ec3d80d66b029c1064fde88391f.

The API addition was premature, as it can potentially be handled
by the platform plugin automatically, and if not, should possibly
live in QSurfaceFormat instead.

Change-Id: I5c7050ce9c50b6c6a93ddfa6d2e842db0b9eed0d
Reviewed-by: Yuhang Zhao <2546789017@qq.com>
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
This commit is contained in:
Tor Arne Vestbø 2022-07-14 09:28:39 +00:00
parent a61bf508e3
commit 845ea89211
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/global/qnamespace.h
View File

@ -228,7 +228,6 @@ namespace Qt {
WindowOverridesSystemGestures = 0x00100000,
WindowDoesNotAcceptFocus = 0x00200000,
MaximizeUsingFullscreenGeometryHint = 0x00400000,
MSWindowsNoRedirectionBitmap = 0x00800000,
CustomizeWindowHint = 0x02000000,
WindowStaysOnBottomHint = 0x04000000,

8
src/corelib/global/qnamespace.qdoc
View File

@ -2190,14 +2190,6 @@
\value MSWindowsOwnDC Gives the window its own display
context on Windows.
\value MSWindowsNoRedirectionBitmap This flag is useful to windows that
only use 3D graphics API to do the rendering, such as D3D11.
This flag was introduced in Qt 6.4
\note Changing this flag after the native window has been created will
have no effect. You can only enable it before the native window is
actually created.
\value BypassWindowManagerHint This flag can be used to indicate to the platform plugin
that "all" window manager protocols should be disabled. This flag will behave
different depending on what operating system the application is running on and

5
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -841,11 +841,8 @@ void WindowCreationData::fromWindow(const QWindow *w, const Qt::WindowFlags flag
// make mouse events fall through this window
// NOTE: WS_EX_TRANSPARENT flag can make mouse inputs fall through a layered window
if (flags & Qt::WindowTransparentForInput)
if (flagsIn & Qt::WindowTransparentForInput)
exStyle |= WS_EX_LAYERED | WS_EX_TRANSPARENT;
if (flags & Qt::MSWindowsNoRedirectionBitmap)
exStyle |= WS_EX_NOREDIRECTIONBITMAP;
}
}