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

views: Add some asserts and comments.

Browse source
This commit is contained in:
Cheng Zhao 2014-08-07 14:48:02 +08:00
parent 92d6fd641f
commit daa00e6539
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
atom/browser/native_window_views.cc
View file

@ -440,7 +440,7 @@ void NativeWindowViews::OnWidgetActivationChanged(
else else
NotifyWindowBlur(); NotifyWindowBlur();
// The menu bar should be hide when window is closed // Hide menu bar when window is blured.
if (!active && menu_bar_autohide_ && menu_bar_show_) { if (!active && menu_bar_autohide_ && menu_bar_show_) {
SetMenuBarVisibility(false); SetMenuBarVisibility(false);
Layout(); Layout();
@ -538,6 +538,7 @@ views::NonClientFrameView* NativeWindowViews::CreateNonClientFrameView(
} }
void NativeWindowViews::HandleMouseDown() { void NativeWindowViews::HandleMouseDown() {
// Hide menu bar when web view is clicked.
if (menu_bar_autohide_ && menu_bar_show_) { if (menu_bar_autohide_ && menu_bar_show_) {
SetMenuBarVisibility(false); SetMenuBarVisibility(false);
Layout(); Layout();
@ -549,6 +550,7 @@ void NativeWindowViews::HandleKeyboardEvent(
const content::NativeWebKeyboardEvent& event) { const content::NativeWebKeyboardEvent& event) {
if (menu_bar_autohide_ && if (menu_bar_autohide_ &&
(event.modifiers & content::NativeWebKeyboardEvent::AltKey) && (event.modifiers & content::NativeWebKeyboardEvent::AltKey) &&
// 164 and 165 represent VK_LALT and VK_RALT.
(event.windowsKeyCode == 164 || event.windowsKeyCode == 165) && (event.windowsKeyCode == 164 || event.windowsKeyCode == 165) &&
(event.type == blink::WebInputEvent::RawKeyDown)) { (event.type == blink::WebInputEvent::RawKeyDown)) {
SetMenuBarVisibility(!menu_bar_show_); SetMenuBarVisibility(!menu_bar_show_);
@ -594,11 +596,14 @@ void NativeWindowViews::SetMenuBarVisibility(bool visible) {
return; return;
menu_bar_show_ = visible; menu_bar_show_ = visible;
if (visible) if (visible) {
DCHECK_EQ(child_count(), 1);
AddChildView(menu_bar_.get()); AddChildView(menu_bar_.get());
else } else {
DCHECK_EQ(child_count(), 2);
RemoveChildView(menu_bar_.get()); RemoveChildView(menu_bar_.get());
} }
}
// static // static
NativeWindow* NativeWindow::Create(content::WebContents* web_contents, NativeWindow* NativeWindow::Create(content::WebContents* web_contents,