#include "mixer_strip.h"
#include "mixer_ui.h"
#include "selection.h"
+#include "ui_config.h"
#include "i18n.h"
show_editor_mixer_when_tracks_arrive = false;
if (yn) {
- Glib::RefPtr<Gdk::Window> win = get_window ();
+ Gtk::Window* toplevel = current_toplevel();
+ Glib::RefPtr<Gdk::Window> win;
Glib::RefPtr<Gdk::Screen> screen;
-
+
+ if (toplevel) {
+ win = toplevel->get_window();
+ }
+
if (win) {
- screen = win->get_screen();
+ screen = win->get_screen();
} else {
screen = Gdk::Screen::get_default();
}
}
}
-#ifdef GTKOSX
+#ifdef __APPLE__
/* XXX gtk problem here */
ensure_all_elements_drawn();
#endif
}
-#ifdef GTKOSX
+#ifdef __APPLE__
void
Editor::ensure_all_elements_drawn ()
{
controls_layout.queue_draw ();
- ruler_label_event_box.queue_draw ();
time_bars_event_box.queue_draw ();
}
#endif
current_mixer_strip->Hiding.connect (sigc::mem_fun(*this, &Editor::current_mixer_strip_hidden));
current_mixer_strip->WidthChanged.connect (sigc::mem_fun (*this, &Editor::mixer_strip_width_changed));
-#ifdef GTKOSX
+#ifdef __APPLE__
current_mixer_strip->WidthChanged.connect (sigc::mem_fun(*this, &Editor::ensure_all_elements_drawn));
#endif
current_mixer_strip->set_embedded (true);
+
}
void
void
Editor::mixer_strip_width_changed ()
{
-#ifdef GTKOSX
+#ifdef __APPLE__
ensure_all_elements_drawn ();
#endif
void
Editor::follow_mixer_selection ()
{
- if (!ARDOUR::Config->get_link_editor_and_mixer_selection() || _following_mixer_selection) {
+ if (_following_mixer_selection) {
return;
}