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

fix: allow maximizing when window enters tablet mode with WCO (#35617)

Browse source 
* fix: Backport CL 3753528 for WCO

* Update comment

* Update shell/browser/ui/views/win_caption_button_container.cc

Co-authored-by: Robo <hop2deep@gmail.com>

Co-authored-by: Robo <hop2deep@gmail.com>
This commit is contained in:
Raymond Zhao 2022-09-13 13:41:23 -07:00 committed by GitHub
parent 12a7d7eea5
commit 62502b8937
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/ui/views/win_caption_button_container.cc
View file

@ -159,10 +159,11 @@ void WinCaptionButtonContainer::UpdateButtons() {
const bool is_touch = ui::TouchUiController::Get()->touch_ui();
restore_button_->SetEnabled(!is_touch);
// The maximize button should only be enabled if the window is
// maximizable *and* touch mode is disabled.
// In touch mode, windows cannot be taken out of fullscreen or tiled mode, so
// the maximize/restore button should be disabled, unless the window is not
// maximized.
const bool maximizable = frame_view_->window()->IsMaximizable();
maximize_button_->SetEnabled(!is_touch && maximizable);
maximize_button_->SetEnabled(!(is_touch && is_maximized) && maximizable);
const bool closable = frame_view_->window()->IsClosable();
close_button_->SetEnabled(closable);