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

Some coding style fixes

Browse source
This commit is contained in:
Cheng Zhao 2014-11-28 15:59:03 +08:00
parent 8a736abac7
commit ff26c3c16f
3 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
atom/browser/api/atom_api_menu_mac.mm
View file

@ -19,13 +19,17 @@ MenuMac::MenuMac() {
}
void MenuMac::Popup(Window* window) {
NativeWindow* native_window = window->window();
if (!native_window)
return;
content::WebContents* web_contents = native_window->GetWebContents();
if (!web_contents)
return;
NSWindow* nswindow = native_window->GetNativeWindow();
base::scoped_nsobject<AtomMenuController> menu_controller(
[[AtomMenuController alloc] initWithModel:model_.get()]);
NativeWindow* native_window = window->window();
NSWindow* nswindow = native_window->GetNativeWindow();
content::WebContents* web_contents = native_window->GetWebContents();
// Fake out a context menu event.
NSEvent* currentEvent = [NSApp currentEvent];
NSPoint position = [nswindow mouseLocationOutsideOfEventStream];
@ -47,13 +51,17 @@ void MenuMac::Popup(Window* window) {
}
void MenuMac::PopupAt(Window* window, int x, int y) {
base::scoped_nsobject<AtomMenuController> menu_controller(
[[AtomMenuController alloc] initWithModel:model_.get()]);
NativeWindow* native_window = window->window();
if (!native_window)
return;
content::WebContents* web_contents = native_window->GetWebContents();
if (!web_contents)
return;
NSView* view = web_contents->GetContentNativeView();
NSMenu* menu = [menu_controller menu];
base::scoped_nsobject<AtomMenuController> menu_controller(
[[AtomMenuController alloc] initWithModel:model_.get()]);
// Show the menu.
[menu popUpMenuPositioningItem:[menu itemAtIndex:0]