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

fix: menu bar visibility when exiting full screen (#38599)

Browse source
This commit is contained in:
wgsheng 2023-06-08 18:19:34 +08:00 • committed by GitHub
parent 5ee890fb6f
commit c8bdd014c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/native_window_views.cc
View file

@ -731,10 +731,14 @@ void NativeWindowViews::SetFullScreen(bool fullscreen) {
gfx::Rect());
// Auto-hide menubar when in fullscreen.
if (fullscreen)
if (fullscreen) {
menu_bar_visible_before_fullscreen_ = IsMenuBarVisible();
SetMenuBarVisibility(false);
else
SetMenuBarVisibility(!IsMenuBarAutoHide());
} else {
SetMenuBarVisibility(!IsMenuBarAutoHide() &&
menu_bar_visible_before_fullscreen_);
menu_bar_visible_before_fullscreen_ = false;
}
#endif
}

3
shell/browser/native_window_views.h
View file

@ -321,6 +321,9 @@ class NativeWindowViews : public NativeWindow,
// Handles unhandled keyboard messages coming back from the renderer process.
views::UnhandledKeyboardEventHandler keyboard_event_handler_;
// Whether the menubar is visible before the window enters fullscreen
bool menu_bar_visible_before_fullscreen_ = false;
// Whether the window should be enabled based on user calls to SetEnabled()
bool is_enabled_ = true;
// How many modal children this window has;