Merge pull request #46 from damywise/main

Fix setResizable glitch on titleBarStyle="hidden"

Author: lijy91

windows/window_manager.cpp

@@ -450,6 +450,7 @@ void WindowManager::SetResizable(const flutter::EncodableMap &args)
     DWORD gwlStyle = GetWindowLong(hWnd, GWL_STYLE);
     gwlStyle = isResizable ? gwlStyle | WS_THICKFRAME : gwlStyle & ~WS_THICKFRAME;
     SetWindowLong(hWnd, GWL_STYLE, gwlStyle);
+	SetWindowPos(hWnd, nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_DRAWFRAME);
 }
 
 bool WindowManager::IsMinimizable()

windows/window_manager_plugin.cpp

@@ -85,12 +85,7 @@ std::optional<LRESULT> WindowManagerPlugin::HandleWindowProc(HWND hWnd, UINT mes
 {
     std::optional<LRESULT> result = std::nullopt;
 
-    if (message == WM_NCPAINT)
-    {
-        if (window_manager->title_bar_style == "hidden")
-            return 1;
-    }
-    else if (message == WM_NCCALCSIZE)
+    if (message == WM_NCCALCSIZE)
     {
         if (wParam && window_manager->is_frameless)
         {
@@ -105,18 +100,25 @@ std::optional<LRESULT> WindowManagerPlugin::HandleWindowProc(HWND hWnd, UINT mes
             GetWindowPlacement(hWnd, &wPos);
             RECT borderThickness;
             SetRectEmpty(&borderThickness);
-            AdjustWindowRectEx(&borderThickness, GetWindowLongPtr(hWnd, GWL_STYLE) & ~WS_CAPTION, FALSE, NULL);
+            AdjustWindowRectEx(&borderThickness, GetWindowLongPtr(hWnd, GWL_STYLE) & ~WS_CAPTION & WS_BORDER, FALSE, NULL);
             NCCALCSIZE_PARAMS *sz = reinterpret_cast<NCCALCSIZE_PARAMS *>(lParam);
+			
+			bool isResizable = window_manager->IsResizable();
             // Add 1 pixel to the top border to make the window resizable from the top border
-            sz->rgrc[0].top += 1;
-            sz->rgrc[0].right -= borderThickness.right;
-            sz->rgrc[0].bottom -= borderThickness.bottom;
-            sz->rgrc[0].left -= borderThickness.left;
+            sz->rgrc[0].top += isResizable ? 1 : 0;
+            sz->rgrc[0].right -= isResizable ? 7 : 0;
+            sz->rgrc[0].bottom -= isResizable ? 7 : 0;
+            sz->rgrc[0].left += isResizable ? 7 : 0;
 
             return (WVR_HREDRAW | WVR_VREDRAW);
         }
     }
-    else if (message == WM_NCHITTEST)
+    if (message == WM_NCPAINT)
+    {
+        if (window_manager->title_bar_style == "hidden")
+            return 1;
+    }
+    else  if (message == WM_NCHITTEST)
     {
         LONG width = 10;
         POINT mouse = {LOWORD(lParam), HIWORD(lParam)};