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

gtk: Make BrowserWindow::HasModalDialog work.

Browse source 
Fixes atom/atom#2658.
This commit is contained in:
Cheng Zhao 2014-06-24 21:52:06 +08:00
parent 27d73b362a
commit 32c881bde9
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/ui/file_dialog_gtk.cc
View file

@ -19,7 +19,8 @@ class FileChooserDialog {
FileChooserDialog(GtkFileChooserAction action, FileChooserDialog(GtkFileChooserAction action,
atom::NativeWindow* parent_window, atom::NativeWindow* parent_window,
const std::string& title, const std::string& title,
const base::FilePath& default_path) { const base::FilePath& default_path)
: dialog_scope_(new atom::NativeWindow::DialogScope(parent_window)) {
const char* confirm_text = GTK_STOCK_OK; const char* confirm_text = GTK_STOCK_OK;
if (action == GTK_FILE_CHOOSER_ACTION_SAVE) if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
confirm_text = GTK_STOCK_SAVE; confirm_text = GTK_STOCK_SAVE;
@ -109,6 +110,8 @@ class FileChooserDialog {
SaveDialogCallback save_callback_; SaveDialogCallback save_callback_;
OpenDialogCallback open_callback_; OpenDialogCallback open_callback_;
scoped_ptr<atom::NativeWindow::DialogScope> dialog_scope_;
DISALLOW_COPY_AND_ASSIGN(FileChooserDialog); DISALLOW_COPY_AND_ASSIGN(FileChooserDialog);
}; };

5
atom/browser/ui/message_box_gtk.cc
View file

@ -22,7 +22,8 @@ class MessageBox {
const std::string& title, const std::string& title,
const std::string& message, const std::string& message,
const std::string& detail) const std::string& detail)
: cancel_id_(0) { : cancel_id_(0),
dialog_scope_(new NativeWindow::DialogScope(parent_window)) {
GtkWindow* window = parent_window ? parent_window->GetNativeWindow() : NULL; GtkWindow* window = parent_window ? parent_window->GetNativeWindow() : NULL;
dialog_ = gtk_dialog_new_with_buttons( dialog_ = gtk_dialog_new_with_buttons(
title.c_str(), title.c_str(),
@ -84,6 +85,8 @@ class MessageBox {
GtkWidget* dialog_; GtkWidget* dialog_;
MessageBoxCallback callback_; MessageBoxCallback callback_;
scoped_ptr<NativeWindow::DialogScope> dialog_scope_;
// The id to return when the dialog is closed without pressing buttons. // The id to return when the dialog is closed without pressing buttons.
int cancel_id_; int cancel_id_;