X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=34027ca0c3600f3f207e2b460034234a15662389;hb=a3c378cf62939c85bcfa3b4c55b68c9163c5e21e;hp=8231289c5a361563ee4c0f61e7430c7782bc1317;hpb=f96a5c2a954c3e0c80b3461c5d70a08b15ed6cb2;p=ardour.git diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc index 8231289c5a..34027ca0c3 100644 --- a/gtk2_ardour/ardour_dialog.cc +++ b/gtk2_ardour/ardour_dialog.cc @@ -27,13 +27,16 @@ #include "keyboard.h" #include "splash.h" #include "utils.h" +#include "window_manager.h" using namespace std; using namespace Gtk; using namespace Gtkmm2ext; +using namespace ARDOUR_UI_UTILS; ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator) : Dialog (title, modal, use_seperator) + , proxy (0) , _splash_pushed (false) { init (); @@ -57,12 +60,16 @@ ArdourDialog::~ArdourDialog () spl->pop_front(); } } + WM::Manager::instance().remove (proxy); } bool ArdourDialog::on_key_press_event (GdkEventKey* ev) { - return relay_key_press (ev, this); + if (!relay_key_press (ev, this)) { + return Gtk::Window::on_key_press_event(ev); + } + return true; } bool @@ -112,6 +119,17 @@ void ArdourDialog::init () { set_border_width (10); - // set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG); + + set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG); + + Gtk::Window* parent = WM::Manager::instance().transient_parent(); + + if (parent) { + set_transient_for (*parent); + } + ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL)); + + proxy = new WM::ProxyTemporary (get_title(), this); + WM::Manager::instance().register_window (proxy); }