commit 0765c46d0a42f8c3188709665c387d630da251d8
author Anton Tarasov <anton.tarasov@jetbrains.com> Thu Mar 28 17:32:45 2019 +0300
committer Anton Tarasov <anton.tarasov@jetbrains.com> Fri Mar 29 17:09:01 2019 +0300
tree 2ad558f523dbc26392ef7138ff82093c50c6ace8
parent db6f3eeaa70816cf81b6a115b59ae687937a77b8

JBR-1313 wrong insets for non-resizable custom-decorated frame

(cherry picked from commit 49ab04bb3085e1c309bbc9910772c6d10268e6d9)

src/windows/native/sun/windows/awt_Frame.cpp

diff --git a/src/windows/native/sun/windows/awt_Frame.cpp b/src/windows/native/sun/windows/awt_Frame.cpp
index de0e8b5..5a03ec1 100644
--- a/src/windows/native/sun/windows/awt_Frame.cpp
+++ b/src/windows/native/sun/windows/awt_Frame.cpp
@@ -1712,19 +1712,13 @@
 }
 
 void GetSysInsets(RECT* insets, AwtFrame* pFrame) {
-    static RECT* sysInsets = NULL;
-
     if (pFrame->IsUndecorated()) {
         ::SetRect(insets, 0, 0, 0, 0);
         return;
     }
-    if (!sysInsets) {
-        sysInsets = new RECT;
-        sysInsets->left = sysInsets->right = ::GetSystemMetrics(SM_CXSIZEFRAME);
-        sysInsets->top = sysInsets->bottom = ::GetSystemMetrics(SM_CYSIZEFRAME);
-        sysInsets->top += ::GetSystemMetrics(SM_CYCAPTION);
-    }
-    ::CopyRect(insets, sysInsets);
+    insets->left = insets->right = ::GetSystemMetrics(pFrame->IsResizable() ? SM_CXSIZEFRAME : SM_CXFIXEDFRAME);
+    insets->top = insets->bottom = ::GetSystemMetrics(pFrame->IsResizable() ? SM_CYSIZEFRAME : SM_CYFIXEDFRAME);
+    insets->top += ::GetSystemMetrics(SM_CYCAPTION);
 }
 
 LRESULT HitTestNCA(AwtFrame* frame, int x, int y) {