X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fardour_dialog.cc;h=f8071c2e622d960481789c42cbbaea1857726ed1;hb=9010262bed21611f2db652d16f63e4af4380259d;hp=12d595b0b06982119983932066caa31a7df6dddb;hpb=c94d352f56270b6c93c66bcc3dc83cd49d5efccc;p=ardour.git

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 12d595b0b0..f8071c2e62 100644
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -40,7 +40,7 @@ ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
         , _splash_pushed (false)
 {
 	init ();
-	set_position (Gtk::WIN_POS_CENTER);
+	set_position (Gtk::WIN_POS_MOUSE);
 }
 
 ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
@@ -55,7 +55,7 @@ ArdourDialog::~ArdourDialog ()
 {
         if (_splash_pushed) {
                 Splash* spl = Splash::instance();
-                
+
                 if (spl) {
                         spl->pop_front();
                 }
@@ -66,12 +66,7 @@ ArdourDialog::~ArdourDialog ()
 bool
 ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
 {
-	if (Keyboard::some_magic_widget_has_focus()) {
-		Keyboard::magic_widget_drop_focus ();
-	}
-
 	Keyboard::the_keyboard().focus_in_window (ev, this);
-	Keyboard::magic_widget_grab_focus ();
 	return Dialog::on_focus_in_event (ev);
 }
 
@@ -79,7 +74,6 @@ bool
 ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
 {
 	if (!get_modal()) {
-		Keyboard::magic_widget_drop_focus ();
 		Keyboard::the_keyboard().focus_out_window (ev, this);
 	}
 	return Dialog::on_focus_out_event (ev);
@@ -88,16 +82,6 @@ ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
 void
 ArdourDialog::on_unmap ()
 {
-	if (Keyboard::some_magic_widget_has_focus()) {
-		Gtk::Widget* widget = get_focus();
-		if (widget) {
-			Gtk::Window* win = static_cast<Gtk::Window*>(get_focus()->get_toplevel());
-			if (win == Keyboard::get_current_window()) {
-				Keyboard::magic_widget_drop_focus ();
-			}
-		}
-	}
-
 	Keyboard::the_keyboard().leave_window (0, this);
 	Dialog::on_unmap ();
 }