Remove ardour_ui.h header inclusion

[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 85c834b033166d46f9b35d14e3d649da9e475b7e..5e88f149ee826099e32cdf19b3dc13569689ddb2 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -42,6 +42,7 @@
 #include "keyeditor.h"
 #include "location_ui.h"
 #include "main_clock.h"
+#include "meterbridge.h"
 #include "meter_patterns.h"
 #include "midi_tracer.h"
 #include "mixer_ui.h"
@@ -223,13 +224,13 @@ ARDOUR_UI::set_session (Session *s)
 
                editor_meter_peak_display.set_name ("meterbridge peakindicator");
                editor_meter_peak_display.unset_flags (Gtk::CAN_FOCUS);
-               editor_meter_peak_display.set_size_request (std::max(9.f, rintf(8.f * ui_scale)), -1);
+               editor_meter_peak_display.set_size_request (std::max(9.f, rintf(8.f * UIConfiguration::instance().get_ui_scale())), -1);
                editor_meter_peak_display.set_corner_radius (3.0);
 
                editor_meter_max_peak = -INFINITY;
                editor_meter_peak_display.signal_button_release_event().connect (sigc::mem_fun(*this, &ARDOUR_UI::editor_meter_peak_button_release), false);
 
-               if (ARDOUR_UI::config()->get_show_editor_meter() && !ARDOUR::Profile->get_trx()) {
+               if (UIConfiguration::instance().get_show_editor_meter() && !ARDOUR::Profile->get_trx()) {
                        transport_tearoff_hbox.pack_start (meter_box, false, false);
                        transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
                        meter_box.show();
@@ -336,7 +337,7 @@ ARDOUR_UI::goto_editor_window ()
        editor->show_window ();
        editor->present ();
        /* mixer should now be on top */
-       if (ARDOUR_UI::config()->get_transients_follow_front()) {
+       if (UIConfiguration::instance().get_transients_follow_front()) {
                WM::Manager::instance().set_transient_for (editor);
        }
        _mixer_on_top = false;
@@ -367,7 +368,7 @@ ARDOUR_UI::goto_mixer_window ()
        mixer->show_window ();
        mixer->present ();
        /* mixer should now be on top */
-       if (ARDOUR_UI::config()->get_transients_follow_front()) {
+       if (UIConfiguration::instance().get_transients_follow_front()) {
                WM::Manager::instance().set_transient_for (mixer);
        }
        _mixer_on_top = true;
@@ -376,18 +377,10 @@ ARDOUR_UI::goto_mixer_window ()
 void
 ARDOUR_UI::toggle_mixer_window ()
 {
-       if (!editor || !mixer) {
-               /* can this really happen?
-                * keyboard shortcut during session close, maybe?
-                */
-#ifndef NDEBUG
-                /* one way to find out: */
-               printf("ARDOUR_UI::toggle_mixer_window: Editor: %p Mixer: %p\n", editor, mixer);
-               PBD::stacktrace (std::cerr, 20);
-               assert (0);
-#endif
-               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;
@@ -395,11 +388,13 @@ ARDOUR_UI::toggle_mixer_window ()
        if (mixer->not_visible ()) {
                show = true;
        }
-       else if (!editor->not_visible () && ARDOUR_UI_UTILS::windows_overlap (editor, mixer)) {
+       else if (   (!editor->not_visible () && ARDOUR_UI_UTILS::windows_overlap (editor, mixer))
+                || (!meterbridge->not_visible () && ARDOUR_UI_UTILS::windows_overlap (meterbridge, mixer))
+                       ) {
                obscuring = true;
        }
 
-       if (obscuring && editor->property_has_toplevel_focus()) {
+       if (obscuring && (editor->property_has_toplevel_focus() || meterbridge->property_has_toplevel_focus())) {
                show = true;
        }
 
@@ -413,18 +408,7 @@ ARDOUR_UI::toggle_mixer_window ()
 void
 ARDOUR_UI::toggle_meterbridge ()
 {
-       if (!editor || !meterbridge) {
-               /* can this really happen?
-                * keyboard shortcut during session close, maybe?
-                */
-#ifndef NDEBUG
-                /* one way to find out: */
-               printf("ARDOUR_UI::toggle_meterbridge: Editor: %p MB: %p\n", editor, meterbridge);
-               PBD::stacktrace (std::cerr, 20);
-               assert (0);
-#endif
-               return;
-       }
+       assert (editor && mixer && meterbridge);
 
        bool show = false;
        bool obscuring = false;
@@ -432,11 +416,13 @@ ARDOUR_UI::toggle_meterbridge ()
        if (meterbridge->not_visible ()) {
                show = true;
        }
-       else if (!editor->not_visible() && ARDOUR_UI_UTILS::windows_overlap (editor, meterbridge)) {
+       else if (   (!editor->not_visible() && ARDOUR_UI_UTILS::windows_overlap (editor, meterbridge))
+                || (!mixer->not_visible () && ARDOUR_UI_UTILS::windows_overlap (meterbridge, mixer))
+                       ) {
                obscuring = true;
        }
 
-       if (obscuring && editor->property_has_toplevel_focus()) {
+       if (obscuring && (editor->property_has_toplevel_focus() || mixer->property_has_toplevel_focus())) {
                show = true;
        }