Skip silent sources on session-archive -- fixes #7699

[ardour.git] / gtk2_ardour / ardour_dialog.cc

diff --git a/gtk2_ardour/ardour_dialog.cc b/gtk2_ardour/ardour_dialog.cc
index 12d595b0b06982119983932066caa31a7df6dddb..68f388682a90e2970b92a8cf31045b2a48a04061 100644 (file)
--- a/gtk2_ardour/ardour_dialog.cc
+++ b/gtk2_ardour/ardour_dialog.cc
@@ -37,15 +37,16 @@ using namespace ARDOUR_UI_UTILS;
 ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
        : Dialog (title, modal, use_seperator)
        , proxy (0)
-        , _splash_pushed (false)
+       , _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)
        : Dialog (title, parent, modal, use_seperator)
-        , _splash_pushed (false)
+       , proxy (0)
+       , _splash_pushed (false)
 {
        init ();
        set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
@@ -53,25 +54,49 @@ 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);
+       proxy->explicit_delete ();
 }
 
-bool
-ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
+void
+ArdourDialog::on_response (int response_id)
+{
+       pop_splash ();
+       hide ();
+       ARDOUR::GUIIdle ();
+       Gtk::Dialog::on_response (response_id);
+}
+
+void
+ArdourDialog::close_self ()
 {
-       if (Keyboard::some_magic_widget_has_focus()) {
-               Keyboard::magic_widget_drop_focus ();
+       /* Don't call Idle, don't pop splash.
+        * This is used at exit and session-close and invoked
+        * via close_all_dialogs.
+        */
+       hide ();
+       Gtk::Dialog::on_response (RESPONSE_CANCEL);
+}
+
+void
+ArdourDialog::pop_splash ()
+{
+       if (_splash_pushed) {
+               Splash* spl = Splash::instance();
+
+               if (spl) {
+                       spl->pop_front();
+               }
+               _splash_pushed = false;
        }
+}
 
+bool
+ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
+{
        Keyboard::the_keyboard().focus_in_window (ev, this);
-       Keyboard::magic_widget_grab_focus ();
        return Dialog::on_focus_in_event (ev);
 }
 
@@ -79,7 +104,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 +112,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 ();
 }
@@ -113,7 +127,7 @@ ArdourDialog::on_show ()
 
        if (spl && spl->is_visible()) {
                spl->pop_back_for (*this);
-                _splash_pushed = true;
+               _splash_pushed = true;
        }
 }
 
@@ -137,7 +151,7 @@ ArdourDialog::init ()
                set_transient_for (*parent);
        }
 
-       ARDOUR_UI::CloseAllDialogs.connect (sigc::bind (sigc::mem_fun (*this, &ArdourDialog::response), RESPONSE_CANCEL));
+       ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourDialog::close_self)); /* send a RESPONSE_CANCEL to self */
 
        proxy = new WM::ProxyTemporary (get_title(), this);
        WM::Manager::instance().register_window (proxy);