fix: some frameless windows showing a frame on Windows (#32707)

Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
electron · Feb 2, 2022 · a23c93a · a23c93a
1 parent a63456b
commit a23c93a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc
@@ -330,15 +330,14 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
     // Set Window style so that we get a minimize and maximize animation when
     // frameless.
     DWORD frame_style = WS_CAPTION | WS_OVERLAPPED;
-    if (resizable_)
+    if (resizable_ && thick_frame_)
       frame_style |= WS_THICKFRAME;
     if (minimizable_)
       frame_style |= WS_MINIMIZEBOX;
     if (maximizable_)
       frame_style |= WS_MAXIMIZEBOX;
-    // We should not show a frame for transparent window.
-    if (!thick_frame_)
-      frame_style &= ~(WS_THICKFRAME | WS_CAPTION);
+    if (!thick_frame_ || !has_frame())
+      frame_style &= ~WS_CAPTION;
     ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
   }