X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_mixer.cc;h=9769d616fe7e6692563c99f46975e735347b202f;hb=bdfddec6fc45b9570d1f3fc03182f4166187c52c;hp=67e749de50171773f140088195516aabd6010dcf;hpb=a1a3f6c8265264227ce19f731bf1863aff229a94;p=ardour.git diff --git a/gtk2_ardour/editor_mixer.cc b/gtk2_ardour/editor_mixer.cc index 67e749de50..9769d616fe 100644 --- a/gtk2_ardour/editor_mixer.cc +++ b/gtk2_ardour/editor_mixer.cc @@ -42,6 +42,7 @@ #include "mixer_strip.h" #include "mixer_ui.h" #include "selection.h" +#include "ui_config.h" #include "i18n.h" @@ -79,7 +80,7 @@ Editor::show_editor_mixer (bool yn) if (yn) { Glib::RefPtr win = get_window (); Glib::RefPtr screen; - + if (win) { screen = win->get_screen(); } else { @@ -166,7 +167,6 @@ void Editor::ensure_all_elements_drawn () { controls_layout.queue_draw (); - ruler_label_event_box.queue_draw (); time_bars_event_box.queue_draw (); } #endif @@ -184,6 +184,7 @@ Editor::create_editor_mixer () current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn)); #endif current_mixer_strip->set_embedded (true); + } void @@ -283,7 +284,7 @@ Editor::track_mixer_selection () void Editor::follow_mixer_selection () { - if (!ARDOUR::Config->get_link_editor_and_mixer_selection() || _following_mixer_selection) { + if (_following_mixer_selection) { return; }