tracks build ... backends are hard-coded

[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 d1efb4d7def93dbf0454dc2c122025de23172848..7d7ee7d60b0df2cf74b8e3f6016bba193134903e 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -376,14 +376,28 @@ ARDOUR_UI::goto_mixer_window ()
 void
 ARDOUR_UI::toggle_mixer_window ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-mixer"));
-       if (!act) {
-               return;
+       /* thse windows are created in ARDOUR_UI::setup_windows()
+        * it should be impossible to get here with any of them being NULL
+        */
+       assert (editor && mixer && meterbridge);
+
+       bool show = false;
+       bool obscuring = false;
+
+       if (mixer->not_visible ()) {
+               show = true;
+       }
+       else if (   (!editor->not_visible () && ARDOUR_UI_UTILS::windows_overlap (editor, mixer))
+                || (!meterbridge->not_visible () && ARDOUR_UI_UTILS::windows_overlap (meterbridge, mixer))
+                       ) {
+               obscuring = true;
        }
 
-       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (obscuring && (editor->property_has_toplevel_focus() || meterbridge->property_has_toplevel_focus())) {
+               show = true;
+       }
 
-       if (tact->get_active()) {
+       if (show) {
                goto_mixer_window ();
        } else {
                mixer->hide ();
@@ -393,19 +407,28 @@ ARDOUR_UI::toggle_mixer_window ()
 void
 ARDOUR_UI::toggle_meterbridge ()
 {
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-meterbridge"));
-       if (!act) {
-               return;
+       assert (editor && mixer && meterbridge);
+
+       bool show = false;
+       bool obscuring = false;
+
+       if (meterbridge->not_visible ()) {
+               show = true;
+       }
+       else if (   (!editor->not_visible() && ARDOUR_UI_UTILS::windows_overlap (editor, meterbridge))
+                || (!mixer->not_visible () && ARDOUR_UI_UTILS::windows_overlap (meterbridge, mixer))
+                       ) {
+               obscuring = true;
        }
 
-       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+       if (obscuring && (editor->property_has_toplevel_focus() || mixer->property_has_toplevel_focus())) {
+               show = true;
+       }
 
-       if (tact->get_active()) {
+       if (show) {
                meterbridge->show_window ();
                meterbridge->present ();
-               if (editor) {
-                       meterbridge->set_transient_for (*editor);
-               }
+               meterbridge->raise ();
        } else {
                meterbridge->hide_window (NULL);
        }
@@ -415,79 +438,37 @@ 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) {
-
-               /* remeber: Screen != Monitor (Screen is a separately rendered
-                * continuous geometry that make include 1 or more monitors.
-                */
-               
-                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) {
+
+       if (editor && mixer) {
+               if (ARDOUR_UI_UTILS::windows_overlap (editor, mixer)) {
+                       obscuring = true;
+               }
+       }
+
+       if (mixer && !mixer->not_visible() && mixer->property_has_toplevel_focus()) {
+               if (obscuring) {
+                       goto_editor_window();
+               }
+       } else if (editor && !editor->not_visible() && editor->property_has_toplevel_focus()) {
+               if (obscuring) {
+                       goto_mixer_window();
+               }
+       } else if (mixer && mixer->not_visible()) {
+               if (obscuring) {
+                       goto_mixer_window ();
+               }
+       } else if (editor && editor->not_visible()) {
+               if (obscuring) {
+                       goto_editor_window ();
+               }
+       } else if (obscuring) {
+               //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 ();
                }
-        }
+       }
 }
 
 void