From 95a08a711e18c7d994085dff6c1d4df065fb273e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 23 Jan 2018 16:47:01 +0100
Subject: Windows QPA: Suppress bogus resize events when using native menus

Account for the (not yet created) native menu height when handling
the initial resize message.

Complements 7849aa6e96aa923fca5523afc8cf88edcc0bcf90.

Task-number: QTBUG-65917
Task-number: QTBUG-55967
Change-Id: I65c75d796634ecf1a90a72fef8ff3e6e89de11c4
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
---
 src/plugins/platforms/windows/qwindowswindow.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/plugins/platforms/windows/qwindowswindow.h')

diff --git a/src/plugins/platforms/windows/qwindowswindow.h b/src/plugins/platforms/windows/qwindowswindow.h
index 414d4a92f8..4e1f49be3b 100644
--- a/src/plugins/platforms/windows/qwindowswindow.h
+++ b/src/plugins/platforms/windows/qwindowswindow.h
@@ -101,6 +101,7 @@ struct QWindowCreationContext
     int frameY = CW_USEDEFAULT;
     int frameWidth = CW_USEDEFAULT;
     int frameHeight = CW_USEDEFAULT;
+    int menuHeight = 0;
 };
 
 struct QWindowsWindowData
-- 
cgit v1.2.3