X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=c7d78099ce1e3cae34354e03f7308c15d939ad25;hb=1e97c09eed646adb030fd198d9ced9530bae20cb;hp=c8a25f187471895575b7a0c213fa10b40808d864;hpb=87d502c15bf78f84a67566e0f2a8d51a820ad14a;p=ardour.git

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index c8a25f1874..c7d78099ce 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -27,14 +27,17 @@
 #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)
-        , _splash_pushed (false)
+	, proxy (0)
+	, _splash_pushed (false)
 {
 	init ();
 	set_position (Gtk::WIN_POS_MOUSE);
@@ -42,7 +45,7 @@ ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
 
 ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
 	: Dialog (title, parent, modal, use_seperator)
-        , _splash_pushed (false)
+	, _splash_pushed (false)
 {
 	init ();
 	set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
@@ -50,33 +53,47 @@ ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool
 
 ArdourDialog::~ArdourDialog ()
 {
-        if (_splash_pushed) {
-                Splash* spl = Splash::instance();
-                
-                if (spl) {
-                        spl->pop_front();
-                }
-        }
+	pop_splash ();
+	Keyboard::the_keyboard().focus_out_window (0, this);
+	WM::Manager::instance().remove (proxy);
 }
 
-bool
-ArdourDialog::on_key_press_event (GdkEventKey* ev)
+void
+ArdourDialog::on_response (int response_id)
+{
+	pop_splash ();
+	hide ();
+	ARDOUR::GUIIdle ();
+	Gtk::Dialog::on_response (response_id);
+}
+
+void
+ArdourDialog::pop_splash ()
 {
-	return relay_key_press (ev, this);
+	if (_splash_pushed) {
+		Splash* spl = Splash::instance();
+
+		if (spl) {
+			spl->pop_front();
+		}
+		_splash_pushed = false;
+	}
 }
 
 bool
-ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
 {
-	Keyboard::the_keyboard().enter_window (ev, this);
-	return Dialog::on_enter_notify_event (ev);
+	Keyboard::the_keyboard().focus_in_window (ev, this);
+	return Dialog::on_focus_in_event (ev);
 }
 
 bool
-ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
 {
-	Keyboard::the_keyboard().leave_window (ev, this);
-	return Dialog::on_leave_notify_event (ev);
+	if (!get_modal()) {
+		Keyboard::the_keyboard().focus_out_window (ev, this);
+	}
+	return Dialog::on_focus_out_event (ev);
 }
 
 void
@@ -97,7 +114,7 @@ ArdourDialog::on_show ()
 
 	if (spl && spl->is_visible()) {
 		spl->pop_back_for (*this);
-                _splash_pushed = true;
+		_splash_pushed = true;
 	}
 }
 
@@ -112,14 +129,17 @@ void
 ArdourDialog::init ()
 {
 	set_border_width (10);
-
+	add_events (Gdk::FOCUS_CHANGE_MASK);
 	set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
 
-	Gtk::Window* parent = WindowManager::instance().transient_parent();
+	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);
 }