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

linux: Fix modal message box.

Browse source
This commit is contained in:
Cheng Zhao 2014-07-14 16:34:22 +08:00
parent adec718503
commit 00467b53c7
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
atom/browser/ui/message_box_views.cc
View file

@ -166,7 +166,7 @@ MessageDialog::MessageDialog(NativeWindow* parent_window,
#if defined(USE_X11) #if defined(USE_X11)
// In X11 the window frame is drawn by the application. // In X11 the window frame is drawn by the application.
widget_params.remove_standard_frame = true; params.remove_standard_frame = true;
#endif #endif
widget_.reset(new views::Widget); widget_.reset(new views::Widget);
@ -237,11 +237,7 @@ views::View* MessageDialog::GetInitiallyFocusedView() {
} }
ui::ModalType MessageDialog::GetModalType() const { ui::ModalType MessageDialog::GetModalType() const {
#if defined(USE_X11)
return ui::MODAL_TYPE_NONE;
#else
return ui::MODAL_TYPE_SYSTEM; return ui::MODAL_TYPE_SYSTEM;
#endif
} }
views::NonClientFrameView* MessageDialog::CreateNonClientFrameView( views::NonClientFrameView* MessageDialog::CreateNonClientFrameView(

2
vendor/brightray vendored

@ -1 +1 @@
Subproject commit 227af5c6af2ce54df0916bc61168045c177d3d39 Subproject commit 13628c0d7f799952c2d0067dbacded0bd73d5671