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

Fix building on Linux.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-28 10:11:47 +00:00
parent c23c667c2d
commit 10c52bd6a6
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ void MenuViews::Popup(Window* window) {
static_cast<NativeWindowViews*>(window->window())->widget(), static_cast<NativeWindowViews*>(window->window())->widget(),
NULL, NULL,
gfx::Rect(cursor, gfx::Size()), gfx::Rect(cursor, gfx::Size()),
views::MenuItemView::TOPLEFT, views::MENU_ANCHOR_TOPLEFT,
ui::MENU_SOURCE_MOUSE, ui::MENU_SOURCE_MOUSE,
views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU)); views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
} }

7
atom/browser/ui/views/menu_delegate.cc
View file

@ -7,6 +7,7 @@
#include "atom/browser/ui/views/menu_bar.h" #include "atom/browser/ui/views/menu_bar.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/button/menu_button.h"
#include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_model_adapter.h"
#include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/widget/widget.h" #include "ui/views/widget/widget.h"
@ -39,7 +40,7 @@ void MenuDelegate::RunMenu(ui::MenuModel* model, views::MenuButton* button) {
button->GetWidget()->GetTopLevelWidget(), button->GetWidget()->GetTopLevelWidget(),
button, button,
bounds, bounds,
views::MenuItemView::TOPRIGHT, views::MENU_ANCHOR_TOPRIGHT,
ui::MENU_SOURCE_MOUSE, ui::MENU_SOURCE_MOUSE,
views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU)); views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU));
} }
@ -107,14 +108,14 @@ void MenuDelegate::WillHideMenu(views::MenuItemView* menu) {
views::MenuItemView* MenuDelegate::GetSiblingMenu( views::MenuItemView* MenuDelegate::GetSiblingMenu(
views::MenuItemView* menu, views::MenuItemView* menu,
const gfx::Point& screen_point, const gfx::Point& screen_point,
views::MenuItemView::AnchorPosition* anchor, views::MenuAnchorPosition* anchor,
bool* has_mnemonics, bool* has_mnemonics,
views::MenuButton** button) { views::MenuButton** button) {
ui::MenuModel* model; ui::MenuModel* model;
if (!menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, button)) if (!menu_bar_->GetMenuButtonFromScreenPoint(screen_point, &model, button))
return NULL; return NULL;
*anchor = views::MenuItemView::TOPLEFT; *anchor = views::MENU_ANCHOR_TOPLEFT;
*has_mnemonics = true; *has_mnemonics = true;
id_ = (*button)->tag(); id_ = (*button)->tag();

2
atom/browser/ui/views/menu_delegate.h
View file

@ -46,7 +46,7 @@ class MenuDelegate : public views::MenuDelegate {
virtual views::MenuItemView* GetSiblingMenu( virtual views::MenuItemView* GetSiblingMenu(
views::MenuItemView* menu, views::MenuItemView* menu,
const gfx::Point& screen_point, const gfx::Point& screen_point,
views::MenuItemView::AnchorPosition* anchor, views::MenuAnchorPosition* anchor,
bool* has_mnemonics, bool* has_mnemonics,
views::MenuButton** button); views::MenuButton** button);