mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: revert "fix: some frameless windows showing a frame on Windows (#32692)" (#33599)

Browse source 
This reverts commit 7c701367c0.
This commit is contained in:
Samuel Attard 2022-04-04 17:01:12 -07:00 • committed by GitHub
parent 477aa389e6
commit a72acfc535
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
shell/browser/native_window_views.cc
View file

@ -340,14 +340,15 @@ NativeWindowViews::NativeWindowViews(const gin_helper::Dictionary& options,
// Set Window style so that we get a minimize and maximize animation when // Set Window style so that we get a minimize and maximize animation when
// frameless. // frameless.
DWORD frame_style = WS_CAPTION | WS_OVERLAPPED; DWORD frame_style = WS_CAPTION | WS_OVERLAPPED;
if (resizable_ && thick_frame_) if (resizable_)
frame_style |= WS_THICKFRAME; frame_style |= WS_THICKFRAME;
if (minimizable_) if (minimizable_)
frame_style |= WS_MINIMIZEBOX; frame_style |= WS_MINIMIZEBOX;
if (maximizable_) if (maximizable_)
frame_style |= WS_MAXIMIZEBOX; frame_style |= WS_MAXIMIZEBOX;
if (!thick_frame_ || !has_frame()) // We should not show a frame for transparent window.
frame_style &= ~WS_CAPTION; if (!thick_frame_)
frame_style &= ~(WS_THICKFRAME | WS_CAPTION);
::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style); ::SetWindowLong(GetAcceleratedWidget(), GWL_STYLE, frame_style);
} }