X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=cb03252d7f8b3c6f1d58154ad8afcfbf6c9f016c;hb=91ae97d5c96e18cbb1f9937a961bd503ee8d5a38;hp=ab8a5ae1433a71bdd0a95b0bcac78d37a37c673a;hpb=555ceba8766c5c1087b4f4bbc2d58c42843b37c9;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index ab8a5ae143..cb03252d7f 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -36,6 +36,7 @@ #include "canvas/rectangle.h" #include "canvas/debug.h" #include "canvas/utils.h" +#include "canvas/colors.h" #include "ardour/profile.h" @@ -73,11 +74,17 @@ const double trim_handle_size = 6.0; /* pixels */ uint32_t TimeAxisView::button_height = 0; uint32_t TimeAxisView::extra_height = 0; int const TimeAxisView::_max_order = 512; -unsigned int TimeAxisView::name_width_px = 100; // TODO adjust with font-scaling on style-change +unsigned int TimeAxisView::name_width_px = 100; PBD::Signal1 TimeAxisView::CatchDeletion; Glib::RefPtr TimeAxisView::controls_meters_size_group = Glib::RefPtr(); Glib::RefPtr TimeAxisView::midi_scroomer_size_group = Glib::RefPtr(); +void +TimeAxisView::setup_sizes() +{ + name_width_px = ceil (100. * ARDOUR_UI::config()->get_font_scale() / 102400.); +} + TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/) : AxisView (sess) , controls_table (3, 3) @@ -218,6 +225,8 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie TimeAxisView::~TimeAxisView() { + CatchDeletion (this); + in_destructor = true; for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { @@ -225,16 +234,16 @@ TimeAxisView::~TimeAxisView() } for (list::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) { - delete (*i)->rect; - delete (*i)->start_trim; - delete (*i)->end_trim; + delete (*i)->rect; (*i)->rect=0; + delete (*i)->start_trim; (*i)->start_trim = 0; + delete (*i)->end_trim; (*i)->end_trim = 0; } for (list::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) { - delete (*i)->rect; - delete (*i)->start_trim; - delete (*i)->end_trim; + delete (*i)->rect; (*i)->rect = 0; + delete (*i)->start_trim; (*i)->start_trim = 0; + delete (*i)->end_trim; (*i)->end_trim = 0; } delete selection_group; @@ -405,9 +414,9 @@ TimeAxisView::controls_ebox_button_press (GdkEventButton* event) } void -TimeAxisView::idle_resize (uint32_t h) +TimeAxisView::idle_resize (int32_t h) { - set_height (h); + set_height (std::max(0, h)); } @@ -559,8 +568,16 @@ TimeAxisView::set_height_enum (Height h, bool apply_to_selection) } void -TimeAxisView::set_height (uint32_t h) +TimeAxisView::set_height (uint32_t h, TrackHeightMode m) { + uint32_t lanes = 0; + if (m == TotalHeight) { + for (Children::iterator i = children.begin(); i != children.end(); ++i) { + if ( !(*i)->hidden()) ++lanes; + } + } + h /= (lanes + 1); + if (h < preset_height (HeightSmall)) { h = preset_height (HeightSmall); } @@ -581,6 +598,12 @@ TimeAxisView::set_height (uint32_t h) show_selection (_editor.get_selection().time); } + if (m != OnlySelf) { + for (Children::iterator i = children.begin(); i != children.end(); ++i) { + (*i)->set_height(h, OnlySelf); + } + } + _editor.override_visible_track_count (); } @@ -1019,10 +1042,10 @@ TimeAxisView::get_selection_rect (uint32_t id) rect = new SelectionRect; - rect->rect = new ArdourCanvas::TimeRectangle (selection_group); + rect->rect = new ArdourCanvas::Rectangle (selection_group); CANVAS_DEBUG_NAME (rect->rect, "selection rect"); rect->rect->set_outline (false); - rect->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect()); + rect->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect")); rect->start_trim = new ArdourCanvas::Rectangle (selection_group); CANVAS_DEBUG_NAME (rect->start_trim, "selection rect start trim"); @@ -1079,7 +1102,7 @@ TimeAxisView::remove_child (boost::shared_ptr child) * @param result Filled in with selectable things. */ void -TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list& /*result*/) +TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list& /*result*/, bool /*within*/) { return; } @@ -1187,26 +1210,26 @@ TimeAxisView::color_handler () for (list::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) { - (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect()); - (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_Selection()); + (*i)->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect")); + (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("selection")); - (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_Selection()); - (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_Selection()); + (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("selection")); + (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("selection")); - (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_Selection()); - (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_Selection()); + (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("selection")); + (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("selection")); } for (list::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) { - (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_SelectionRect()); - (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_Selection()); + (*i)->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect")); + (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("selection")); - (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->get_Selection()); - (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_Selection()); + (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("selection")); + (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("selection")); - (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->get_Selection()); - (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_Selection()); + (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("selection")); + (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("selection")); } } @@ -1311,7 +1334,7 @@ TimeAxisView::preset_height (Height h) return button_height + extra_height; } - /* NOTREACHED */ + abort(); /* NOTREACHED */ return 0; }