github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

apply window style directly when changing resizability

Browse Source
This commit is contained in:
Mitchell Cohen
2026-02-25 20:51:45 -05:00
parent ec6ca2b630
commit 949e2ee2ab
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
shell/browser/native_window_views.cc
View File

@@ -977,6 +977,9 @@ void NativeWindowViews::SetResizable(bool resizable) {
widget()->OnSizeConstraintsChanged();
#elif BUILDFLAG(IS_WIN)
UpdateThickFrame();
FlipWindowStyle(GetAcceleratedWidget(), maximizable_ && CanResize(),
WS_MAXIMIZEBOX);
UpdateWindowControlsOverlayButtons();
#endif
}
}
@@ -1064,11 +1067,7 @@ bool NativeWindowViews::IsMovable() const {
void NativeWindowViews::SetMinimizable(bool minimizable) {
#if BUILDFLAG(IS_WIN)
FlipWindowStyle(GetAcceleratedWidget(), minimizable, WS_MINIMIZEBOX);
if (IsWindowControlsOverlayEnabled()) {
auto* frame_view =
static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
frame_view->caption_button_container()->UpdateButtons();
}
UpdateWindowControlsOverlayButtons();
#endif
minimizable_ = minimizable;
}
@@ -1083,12 +1082,9 @@ bool NativeWindowViews::IsMinimizable() const {
void NativeWindowViews::SetMaximizable(bool maximizable) {
#if BUILDFLAG(IS_WIN)
FlipWindowStyle(GetAcceleratedWidget(), maximizable, WS_MAXIMIZEBOX);
if (IsWindowControlsOverlayEnabled()) {
auto* frame_view =
static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
frame_view->caption_button_container()->UpdateButtons();
}
FlipWindowStyle(GetAcceleratedWidget(), maximizable && CanResize(),
WS_MAXIMIZEBOX);
UpdateWindowControlsOverlayButtons();
#endif
maximizable_ = maximizable;
}
@@ -1122,11 +1118,7 @@ void NativeWindowViews::SetClosable(bool closable) {
} else {
EnableMenuItem(menu, SC_CLOSE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED);
}
if (IsWindowControlsOverlayEnabled()) {
auto* frame_view =
static_cast<WinFrameView*>(widget()->non_client_view()->frame_view());
frame_view->caption_button_container()->UpdateButtons();
}
UpdateWindowControlsOverlayButtons();
#endif
}
@@ -1782,6 +1774,22 @@ void NativeWindowViews::SetIcon(const gfx::ImageSkia& icon) {
#endif
#if BUILDFLAG(IS_WIN)
void NativeWindowViews::UpdateWindowControlsOverlayButtons() {
if (!IsWindowControlsOverlayEnabled())
return;
auto* const non_client_view = widget()->non_client_view();
if (!non_client_view)
return;
auto* const frame_view =
static_cast<WinFrameView*>(non_client_view->frame_view());
if (!frame_view)
return;
frame_view->caption_button_container()->UpdateButtons();
}
void NativeWindowViews::UpdateThickFrame() {
if (!thick_frame_)
return;

1
shell/browser/native_window_views.h
View File

@@ -236,6 +236,7 @@ class NativeWindowViews : public NativeWindow,
bool ExecuteWindowsCommand(int command_id) override;
void HandleSizeEvent(WPARAM w_param, LPARAM l_param);
void ResetWindowControls();
void UpdateWindowControlsOverlayButtons();
void SetRoundedCorners(bool rounded);
void SetForwardMouseMessages(bool forward);
static LRESULT CALLBACK SubclassProc(HWND hwnd,