Fix editor sizing issue introduced in 4dc65e66

[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 8b6eaa044bff4c4cb3a8956d704b646c739d5b6c..7a8366517e6165ec7f2829b47eb7fdedb9c31849 100644 (file)
--- a/gtk2_ardour/ardour_ui_dialogs.cc
+++ b/gtk2_ardour/ardour_ui_dialogs.cc
@@ -61,6 +61,7 @@
 #include "midi_tracer.h"
 #include "mini_timeline.h"
 #include "mixer_ui.h"
+#include "plugin_dspload_window.h"
 #include "public_editor.h"
 #include "processor_box.h"
 #include "rc_option_editor.h"
@@ -72,6 +73,7 @@
 #include "sfdb_ui.h"
 #include "time_info_box.h"
 #include "timers.h"
+#include "transport_masters_dialog.h"
 
 #include "pbd/i18n.h"
 
@@ -127,6 +129,9 @@ ARDOUR_UI::set_session (Session *s)
        big_clock->set_session (s);
        video_timeline->set_session (s);
        lua_script_window->set_session (s);
+       plugin_dsp_load_window->set_session (s);
+       transport_masters_window->set_session (s);
+       rc_option_editor->set_session (s);
 
        /* sensitize menu bar options that are now valid */
 
@@ -209,21 +214,19 @@ ARDOUR_UI::set_session (Session *s)
 
        update_format ();
 
-       if (meter_box.get_parent()) {
-               transport_hbox.remove (meter_box);
-               transport_hbox.remove (editor_meter_peak_display);
+       if (editor_meter_table.get_parent()) {
+               transport_hbox.remove (editor_meter_table);
        }
 
        if (editor_meter) {
-               meter_box.remove(*editor_meter);
+               editor_meter_table.remove(*editor_meter);
                delete editor_meter;
                editor_meter = 0;
                editor_meter_peak_display.hide();
        }
 
-       if (meter_box.get_parent()) {
-               transport_hbox.remove (meter_box);
-               transport_hbox.remove (editor_meter_peak_display);
+       if (editor_meter_table.get_parent()) {
+               transport_hbox.remove (editor_meter_table);
        }
 
        if (_session &&
@@ -237,9 +240,14 @@ ARDOUR_UI::set_session (Session *s)
                        editor_meter->set_meter_type (_session->master_out()->meter_type());
                        editor_meter->setup_meters (30, 10, 6);
                        editor_meter->show();
-                       meter_box.pack_start(*editor_meter);
-
                        editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1));
+
+                       editor_meter_table.set_spacings(3);
+                       editor_meter_table.attach(*editor_meter,             0,1, 0,1, FILL, FILL);
+                       editor_meter_table.attach(editor_meter_peak_display, 0,1, 1,2, FILL, EXPAND|FILL);
+
+                       editor_meter->show();
+                       editor_meter_peak_display.show();
                }
 
                ArdourMeter::ResetAllPeakDisplays.connect (sigc::mem_fun(*this, &ARDOUR_UI::reset_peak_display));
@@ -248,7 +256,7 @@ 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 * UIConfiguration::instance().get_ui_scale())), -1);
+               editor_meter_peak_display.set_size_request (-1, std::max(6.f, rintf(5.f * UIConfiguration::instance().get_ui_scale())) );
                editor_meter_peak_display.set_corner_radius (3.0);
 
                editor_meter_max_peak = -INFINITY;
@@ -309,7 +317,7 @@ ARDOUR_UI::unload_session (bool hide_stuff)
        fps_connection.disconnect();
 
        if (editor_meter) {
-               meter_box.remove(*editor_meter);
+               editor_meter_table.remove(*editor_meter);
                delete editor_meter;
                editor_meter = 0;
                editor_meter_peak_display.hide();
@@ -329,12 +337,10 @@ ARDOUR_UI::unload_session (bool hide_stuff)
 
        blink_connection.disconnect ();
 
-       delete _session;
+       ARDOUR::Session* session_to_delete = _session;
        _session = 0;
+       delete session_to_delete;
 
-       session_loaded = false;
-
-       update_buffer_load ();
        update_title ();
 
        return 0;
@@ -975,3 +981,27 @@ ARDOUR_UI::toggle_monitor_section_visibility ()
                        mixer->show_monitor_section (tact->get_active());
        }
 }
+
+void
+ARDOUR_UI::toggle_vca_pane ()
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleVCAPane");
+
+       if (act) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+               mixer->showhide_vcas (tact->get_active());
+       }
+}
+
+#ifdef MIXBUS
+void
+ARDOUR_UI::toggle_mixbus_pane ()
+{
+       Glib::RefPtr<Action> act = ActionManager::get_action ("Common", "ToggleMixbusPane");
+
+       if (act) {
+               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+               mixer->showhide_mixbusses (tact->get_active());
+       }
+}
+#endif