most of the 2.X->3.0 commit (up to rev 4299) except for gtk2_ardour/editor_canvas...

[ardour.git] / gtk2_ardour / ardour_ui_dependents.cc

diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
index f81dc8d311bf90302ad5d5827edc22682202f499..eacf0b50b74ab230a2ba97e0ed51aa07e20d57df 100644 (file)
--- a/gtk2_ardour/ardour_ui_dependents.cc
+++ b/gtk2_ardour/ardour_ui_dependents.cc
@@ -99,6 +99,7 @@ ARDOUR_UI::goto_editor_window ()
 
        editor->show_window ();
        editor->present ();
+       _mixer_on_top = false;
        flush_pending ();
 }
 
@@ -107,12 +108,30 @@ ARDOUR_UI::goto_mixer_window ()
 {
        mixer->show_window ();
        mixer->present ();
+       _mixer_on_top = true;
        flush_pending ();
 }
 
+void
+ARDOUR_UI::toggle_editor_mixer_on_top ()
+{
+       if (_mixer_on_top) {
+               goto_editor_window ();
+       } else {
+               goto_mixer_window ();
+       }
+}
+
 gint
 ARDOUR_UI::exit_on_main_window_close (GdkEventAny *ev)
 {
+#ifdef TOP_MENUBAR
+       /* just hide the window, and return - the top menu stays up */
+       editor->hide ();
+       return TRUE;
+#else
+       /* time to get out of here */
        finish();
        return TRUE;
+#endif
 }