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

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
Show stats 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]

19
atom/browser/api/atom_api_menu_views.cc
View file

@ -21,14 +21,21 @@ void MenuViews::Popup(Window* window) {
}
void MenuViews::PopupAt(Window* window, int x, int y) {
NativeWindow* nativeWindowViews =
static_cast<NativeWindow*>(window->window());
gfx::Point viewOrigin = nativeWindowViews->GetWebContents()
->GetRenderWidgetHostView()->GetViewBounds().origin();
PopupAtPoint(window, gfx::Point(viewOrigin.x() + x, viewOrigin.y() + y));
NativeWindow* native_window = static_cast<NativeWindow*>(window->window());
if (!native_window)
return;
content::WebContents* web_contents = native_window->GetWebContents();
if (!web_contents)
return;
content::RenderWidgetHostView* view = web_contents->GetRenderWidgetHostView();
if (!view)
return;
gfx::Point origin = view->GetViewBounds().origin();
PopupAtPoint(window, gfx::Point(origin.x() + x, origin.y() + y));
}
void MenuViews::PopupAtPoint(Window* window, gfx::Point point) {
void MenuViews::PopupAtPoint(Window* window, const gfx::Point& point) {
views::MenuRunner menu_runner(
model(),
views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);

3
atom/browser/api/atom_api_menu_views.h
View file

@ -21,7 +21,8 @@ class MenuViews : public Menu {
virtual void PopupAt(Window* window, int x, int y) OVERRIDE;
private:
void PopupAtPoint(Window* window, gfx::Point point);
void PopupAtPoint(Window* window, const gfx::Point& point);
DISALLOW_COPY_AND_ASSIGN(MenuViews);
};