diff options
author | Andy Shaw <andy.shaw@qt.io> | 2020-05-18 14:04:30 +0200 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2020-05-19 10:15:30 +0200 |
commit | 60ec350bc79d562c0611bc31e8655729272c31d6 (patch) | |
tree | 853d3082465294037f7f8cf5502344bbf4de0aa8 /src/plugins/platforms/windows/qwindowswindow.cpp | |
parent | 63a88d0d26eff44549be233518c8005356139f7a (diff) |
Windows: Update the hasFrame setting when changing window flags
Since changing the window flags can make it frameless or have a frame
then it should ensure that the hasFrame setting is updated accordingly
when the window flags do.
Change-Id: I7bf4995d7967623b117426d8750e63fa97967e2c
Pick-to: 5.15
Pick-to: 5.12
Fixes: QTBUG-84029
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowswindow.cpp')
-rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 6c6544aeab..68e4c3d8fc 100644 --- a/src/plugins/platforms/windows/qwindowswindow.cpp +++ b/src/plugins/platforms/windows/qwindowswindow.cpp @@ -2152,6 +2152,7 @@ QWindowsWindowData QWindowsWindow::setWindowFlags_sys(Qt::WindowFlags wt, QWindowsWindowData result = m_data; result.flags = creationData.flags; result.embedded = creationData.embedded; + result.hasFrame = (creationData.style & (WS_DLGFRAME | WS_THICKFRAME)); return result; } |