diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-25 23:46:18 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-12-25 23:46:18 +0000 |
| commit | 60efec48f2861fba5e02ca4fff61bfdcef33f56f (patch) | |
| tree | 2dbcec0c9c8d1453c422c10a53d691203f18e965 /src/extension/execution-env.cpp | |
| parent | Fix start anchors (diff) | |
| parent | Merge about-box Gtkmm changes (diff) | |
| download | inkscape-60efec48f2861fba5e02ca4fff61bfdcef33f56f.tar.gz inkscape-60efec48f2861fba5e02ca4fff61bfdcef33f56f.zip | |
Merge branch 'master' into powerpencilII
Diffstat (limited to 'src/extension/execution-env.cpp')
| -rw-r--r-- | src/extension/execution-env.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/extension/execution-env.cpp b/src/extension/execution-env.cpp index f75b06937..588543a76 100644 --- a/src/extension/execution-env.cpp +++ b/src/extension/execution-env.cpp @@ -12,7 +12,8 @@ #include <config.h> #endif -#include "gtkmm/messagedialog.h" +#include <gtkmm/dialog.h> +#include <gtkmm/messagedialog.h> #include "execution-env.h" #include "prefdialog.h" @@ -141,7 +142,15 @@ ExecutionEnv::createWorkingDialog (void) { g_free(dlgmessage); if (!_effect->is_silent()){ - _visibleDialog->show(); + Gtk::Dialog *dlg = _effect->get_pref_dialog(); + if (dlg) { + _visibleDialog->set_transient_for(*dlg); + } else { + // ToDo: Do we need to make the window transient for the main window here? + // Currently imossible to test because of GUI freezing during save, + // see https://bugs.launchpad.net/inkscape/+bug/967416 + } + _visibleDialog->show_now(); } return; |