use WindowProxy::signal_(map|unmap) to keep window toggle actions in their correct...

diff --git a/gtk2_ardour/window_manager.cc b/gtk2_ardour/window_manager.cc
index cac4bcd968ea744220f2faeec09a739c7a78b65c..24ed57da6d4f3fc330332cfc2922daf0a90cd2b7 100644 (file)
--- a/gtk2_ardour/window_manager.cc
+++ b/gtk2_ardour/window_manager.cc
@@ -68,11 +68,45 @@ Manager::register_window (ProxyBase* info)
                if (!window_actions) {
                        window_actions = ARDOUR_UI::instance()->global_actions.create_action_group (X_("Window"));
                }
-
+               
                info->set_action (ARDOUR_UI::instance()->global_actions.register_toggle_action (window_actions,
                         info->action_name().c_str(), info->menu_name().c_str(),
                         sigc::bind (sigc::mem_fun (*this, &Manager::toggle_window), info)));
+
+               info->signal_map.connect (sigc::bind (sigc::mem_fun (*this, &Manager::window_proxy_was_mapped), info));
+               info->signal_unmap.connect (sigc::bind (sigc::mem_fun (*this, &Manager::window_proxy_was_unmapped), info));
+
+       }
+}
+
+void
+Manager::window_proxy_was_mapped (ProxyBase* proxy)
+{
+       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       if (!act) {
+               return;
+       }
+       Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
        }
+
+       tact->set_active (true);
+}
+
+void
+Manager::window_proxy_was_unmapped (ProxyBase* proxy)
+{
+       Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
+       if (!act) {
+               return;
+       }
+       Glib::RefPtr<Gtk::ToggleAction> tact = Glib::RefPtr<Gtk::ToggleAction>::cast_dynamic (act);
+       if (!tact) {
+               return;
+       }
+
+       tact->set_active (false);
 }
 
 void
@@ -89,7 +123,6 @@ Manager::remove (const ProxyBase* info)
 void
 Manager::toggle_window (ProxyBase* proxy)
 {
-
        Glib::RefPtr<Gtk::Action> act = ARDOUR_UI::instance()->global_actions.find_action (string_compose ("%1/%2", window_actions->get_name(), proxy->action_name()));
        if (!act) {
                return;
@@ -196,6 +229,7 @@ ProxyBase::setup ()
 {
        WindowProxy::setup ();
        set_session(_session);
+
 }
 
 /*-----------------------*/

diff --git a/gtk2_ardour/window_manager.h b/gtk2_ardour/window_manager.h
index 37744e5964801bc1b8ac7abc7d0da64852ae3aa9..9d0363eba9b8fb9d53753c909f83149e4c528ef2 100644 (file)
--- a/gtk2_ardour/window_manager.h
+++ b/gtk2_ardour/window_manager.h
@@ -76,6 +76,9 @@ class Manager : public ARDOUR::SessionHandlePtr
        ~Manager();
 
        static Manager* _instance;
+  private:
+       void window_proxy_was_mapped (ProxyBase*);
+       void window_proxy_was_unmapped (ProxyBase*);
 };
 
 class ProxyBase : public ARDOUR::SessionHandlePtr, public Gtkmm2ext::WindowProxy