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

Remove NativeWindow::ActivateContents

Browse source
This commit is contained in:
Cheng Zhao 2015-06-25 13:18:36 +08:00
parent eb370ba22a
commit e41b0d4d2c
5 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/api/atom_api_web_contents.cc
View file

@ -267,8 +267,7 @@ void WebContents::CloseContents(content::WebContents* source) {
}
void WebContents::ActivateContents(content::WebContents* source) {
if (type_ == BROWSER_WINDOW)
owner_window()->CloseContents(source);
Emit("activate");
}
bool WebContents::IsPopupOrPanel(const content::WebContents* source) const {

5
atom/browser/api/lib/browser-window.coffee
View file

@ -20,6 +20,11 @@ BrowserWindow::_init = ->
@webContents.on 'move', (event, size) =>
@setSize size
# Hide the auto-hide menu when webContents is focused.
@webContents.on 'activate', =>
if process.platform isnt 'darwin' and @isMenuBarAutoHide() and @isMenuBarVisible()
@setMenuBarVisibility false
# Redirect focus/blur event to app instance too.
@on 'blur', (event) =>
app.emit 'browser-window-blur', event, this