Fix DSP load sorting with inactive plugins

[ardour.git] / gtk2_ardour / ardour_ui_dialogs.cc

diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc
index f56f4c6adce831fddfe1b3260bb2f32a54976340..4064809d25c17d3620a200d0104d83344a8890ae 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -82,6 +82,7 @@
 #include "time_info_box.h"
 #include "timers.h"
 #include "transport_masters_dialog.h"
+#include "virtual_keyboard_window.h"
 
 #include "pbd/i18n.h"
 
@@ -103,12 +104,18 @@ ARDOUR_UI::set_session (Session *s)
                big_transport_window->set_session (s);
        }
 
+       if (virtual_keyboard_window) {
+               virtual_keyboard_window->set_session (s);
+       }
+
        if (!_session) {
                WM::Manager::instance().set_session (s);
                /* Session option editor cannot exist across change-of-session */
                session_option_editor.drop_window ();
                /* Ditto for AddVideoDialog */
                add_video_dialog.drop_window ();
+               /* screensaver + layered button sensitivity */
+               map_transport_state ();
                return;
        }
 
@@ -887,6 +894,14 @@ ARDOUR_UI::create_big_transport_window ()
        return btw;
 }
 
+VirtualKeyboardWindow*
+ARDOUR_UI::create_virtual_keyboard_window ()
+{
+       VirtualKeyboardWindow* vkbd = new VirtualKeyboardWindow ();
+       vkbd->set_session (_session);
+       return vkbd;
+}
+
 void
 ARDOUR_UI::handle_locations_change (Location *)
 {
@@ -912,6 +927,9 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj
                        if (big_transport_window) {
                                big_transport_window->set_transient_for (*editor->own_window());
                        }
+                       if (virtual_keyboard_window) {
+                               virtual_keyboard_window->set_transient_for (*editor->own_window());
+                       }
                }
 
        } else if (object == mixer) {
@@ -924,6 +942,9 @@ ARDOUR_UI::tabbed_window_state_event_handler (GdkEventWindowState* ev, void* obj
                        if (big_transport_window) {
                                big_transport_window->set_transient_for (*mixer->own_window());
                        }
+                       if (virtual_keyboard_window) {
+                               virtual_keyboard_window->set_transient_for (*mixer->own_window());
+                       }
                }
        }