Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: allow maximizing when window enters tablet mode with WCO #35664

Merged
merged 3 commits into from Sep 14, 2022
Merged

fix: allow maximizing when window enters tablet mode with WCO #35664

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1994e90
fix: Backport CL 3753528 for WCO
rzhao271 Sep 9, 2022
bb7dee6
Update comment
rzhao271 Sep 9, 2022
f4a66a3
Update shell/browser/ui/views/win_caption_button_container.cc
rzhao271 Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions shell/browser/ui/views/win_caption_button_container.cc
View file
Open in desktop
Expand Up @@ -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);
Expand Down