{
SessionHandlePtr::set_session (s);
- if (audio_port_matrix) {
- audio_port_matrix->set_session (s);
- }
-
- if (midi_port_matrix) {
- midi_port_matrix->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 */
}
}
+ WM::Manager::instance().set_session (s);
+
AutomationWatch::instance().set_session (s);
- WindowManager::instance().set_session (s);
if (shuttle_box) {
shuttle_box->set_session (s);
second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_second), 1000);
point_one_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_one_seconds), 100);
- point_zero_one_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_one_seconds), 40);
+ point_zero_something_second_connection = Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::every_point_zero_something_seconds), 40);
update_format ();
}
if (hide_stuff) {
editor->hide ();
mixer->hide ();
+ meterbridge->hide ();
theme_manager->hide ();
+ audio_port_matrix->hide();
+ midi_port_matrix->hide();
+ route_params->hide();
}
second_connection.disconnect ();
point_one_second_connection.disconnect ();
- point_oh_five_second_connection.disconnect ();
- point_zero_one_second_connection.disconnect();
+ point_zero_something_second_connection.disconnect();
ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false);
rec_button.set_sensitive (false);
+ WM::Manager::instance().set_session ((ARDOUR::Session*) 0);
ARDOUR_UI::instance()->video_timeline->close_session();
stop_blinking ();
editor->show_window ();
editor->present ();
- flush_pending ();
+ /* mixer should now be on top */
+ WM::Manager::instance().set_transient_for (editor);
+ _mixer_on_top = false;
}
void
ARDOUR_UI::goto_mixer_window ()
{
- if (!editor) {
- return;
- }
-
- Glib::RefPtr<Gdk::Window> win = editor->get_window ();
+ Glib::RefPtr<Gdk::Window> win;
Glib::RefPtr<Gdk::Screen> screen;
+ if (editor) {
+ win = editor->get_window ();
+ }
+
if (win) {
screen = win->get_screen();
} else {
mixer->show_window ();
mixer->present ();
- flush_pending ();
+ /* mixer should now be on top */
+ WM::Manager::instance().set_transient_for (mixer);
+ _mixer_on_top = true;
}
-
void
ARDOUR_UI::toggle_mixer_window ()
{
}
void
-ARDOUR_UI::toggle_editor_mixer ()
+ARDOUR_UI::toggle_meterbridge ()
{
- if (editor && mixer) {
-
- if (editor->get_screen() != mixer->get_screen()) {
- // different screens, so don't do anything
- return;
- }
-
- /* See if they are obscuring each other */
-
- gint ex, ey, ew, eh;
- gint mx, my, mw, mh;
-
- editor->get_position (ex, ey);
- editor->get_size (ew, eh);
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-meterbridge"));
+ if (!act) {
+ return;
+ }
- mixer->get_position (mx, my);
- mixer->get_size (mw, mh);
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
- GdkRectangle e;
- GdkRectangle m;
- GdkRectangle r;
+ if (tact->get_active()) {
+ meterbridge->show_window ();
+ } else {
+ meterbridge->hide_window (NULL);
+ }
+}
- e.x = ex;
- e.y = ey;
- e.width = ew;
- e.height = eh;
+void
+ARDOUR_UI::toggle_editor_mixer ()
+{
+ bool obscuring = false;
+ /* currently, if windows are on different
+ screens then we do nothing; but in the
+ future we may want to bring the window
+ to the front or something, so I'm leaving this
+ variable for future use
+ */
+ bool same_screen = true;
+
+ if (editor && mixer) {
- m.x = mx;
- m.y = my;
- m.width = mw;
- m.height = mh;
+ /* remeber: Screen != Monitor (Screen is a separately rendered
+ * continuous geometry that make include 1 or more monitors.
+ */
- if (!gdk_rectangle_intersect (&e, &m, &r)) {
- /* they do not intersect so do not toggle */
- return;
+ if (editor->get_screen() != mixer->get_screen() && (mixer->get_screen() != 0) && (editor->get_screen() != 0)) {
+ // different screens, so don't do anything
+ same_screen = false;
+ } else {
+ // they are on the same screen, see if they are obscuring each other
+
+ gint ex, ey, ew, eh;
+ gint mx, my, mw, mh;
+
+ editor->get_position (ex, ey);
+ editor->get_size (ew, eh);
+
+ mixer->get_position (mx, my);
+ mixer->get_size (mw, mh);
+
+ GdkRectangle e;
+ GdkRectangle m;
+ GdkRectangle r;
+
+ e.x = ex;
+ e.y = ey;
+ e.width = ew;
+ e.height = eh;
+
+ m.x = mx;
+ m.y = my;
+ m.width = mw;
+ m.height = mh;
+
+ if (gdk_rectangle_intersect (&e, &m, &r)) {
+ obscuring = true;
+ }
+ }
+ }
+
+ if (mixer && !mixer->not_visible() && mixer->property_has_toplevel_focus()) {
+ if (obscuring && same_screen) {
+ goto_editor_window();
+ }
+ } else if (editor && !editor->not_visible() && editor->property_has_toplevel_focus()) {
+ if (obscuring && same_screen) {
+ goto_mixer_window();
+ }
+ } else if (mixer && mixer->not_visible()) {
+ if (obscuring && same_screen) {
+ goto_mixer_window ();
+ }
+ } else if (editor && editor->not_visible()) {
+ if (obscuring && same_screen) {
+ goto_editor_window ();
+ }
+ } else if (obscuring && same_screen) {
+ //it's unclear what to do here, so just do the opposite of what we did last time (old behavior)
+ if (_mixer_on_top) {
+ goto_editor_window ();
+ } else {
+ goto_mixer_window ();
}
- }
-
- if (mixer && mixer->fully_visible()) {
- goto_editor_window ();
- } else {
- goto_mixer_window ();
- }
+ }
}
void
projects / ardour.git / blobdiff