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

linux: Only use global application menubar on unity.

Browse source 
Fixes atom/atom#3114.
This commit is contained in:
Cheng Zhao 2014-07-31 13:09:31 +08:00
parent ab4558ae32
commit 4a7e98e398
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/native_window_views.cc
View file

@ -39,6 +39,7 @@
#if defined(USE_X11) #if defined(USE_X11)
#include "atom/browser/ui/views/global_menu_bar_x11.h" #include "atom/browser/ui/views/global_menu_bar_x11.h"
#include "atom/browser/ui/views/frameless_view.h" #include "atom/browser/ui/views/frameless_view.h"
#include "chrome/browser/ui/libgtk2ui/unity_service.h"
#include "ui/gfx/x/x11_types.h" #include "ui/gfx/x/x11_types.h"
#include "ui/views/window/native_frame_view.h" #include "ui/views/window/native_frame_view.h"
#elif defined(OS_WIN) #elif defined(OS_WIN)
@ -338,11 +339,11 @@ void NativeWindowViews::SetMenu(ui::MenuModel* menu_model) {
RegisterAccelerators(menu_model); RegisterAccelerators(menu_model);
#if defined(USE_X11) #if defined(USE_X11)
if (!global_menu_bar_) if (unity::IsRunning() && !global_menu_bar_)
global_menu_bar_.reset(new GlobalMenuBarX11(this)); global_menu_bar_.reset(new GlobalMenuBarX11(this));
// Use global application menu bar when possible. // Use global application menu bar when possible.
if (global_menu_bar_->IsServerStarted()) { if (global_menu_bar_ && global_menu_bar_->IsServerStarted()) {
global_menu_bar_->SetMenu(menu_model); global_menu_bar_->SetMenu(menu_model);
return; return;
} }