#include "canvas/canvas.h"
#include "canvas/rectangle.h"
#include "canvas/debug.h"
+#include "canvas/utils.h"
+#include "canvas/colors.h"
#include "ardour/profile.h"
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<void,TimeAxisView*> TimeAxisView::CatchDeletion;
Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::controls_meters_size_group = Glib::RefPtr<Gtk::SizeGroup>();
Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::midi_scroomer_size_group = Glib::RefPtr<Gtk::SizeGroup>();
+void
+TimeAxisView::setup_sizes()
+{
+ name_width_px = ceilf (100.f * ARDOUR_UI::ui_scale);
+}
+
TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
: AxisView (sess)
, controls_table (3, 3)
, _order (0)
, _effective_height (0)
, _resize_drag_start (-1)
+ , _did_resize (false)
, _preresize_cursor (0)
, _have_preresize_cursor (false)
, _ebox_release_can_act (true)
compute_heights ();
}
- _canvas_display = new ArdourCanvas::Container (ed.get_trackview_group (), ArdourCanvas::Duple (1.0, 0.0));
+ _canvas_display = new ArdourCanvas::Container (ed.get_trackview_group ());
CANVAS_DEBUG_NAME (_canvas_display, "main for TAV");
_canvas_display->hide(); // reveal as needed
- _canvas_separator = new ArdourCanvas::Line(ed.get_trackview_group ());
+ _canvas_separator = new ArdourCanvas::Line(_canvas_display);
CANVAS_DEBUG_NAME (_canvas_separator, "separator for TAV");
- _canvas_separator->set_outline_color(RGBA_TO_UINT (0, 0, 0, 255));
+ _canvas_separator->set (ArdourCanvas::Duple(0.0, 0.0), ArdourCanvas::Duple(ArdourCanvas::COORD_MAX, 0.0));
+ _canvas_separator->set_outline_color(ArdourCanvas::rgba_to_color (0, 0, 0, 1.0));
_canvas_separator->set_outline_width(1.0);
_canvas_separator->hide();
name_label.set_width_chars (12);
ARDOUR_UI::instance()->set_tip (name_label, _("Track/Bus name (double click to edit)"));
- Gtk::Entry* an_entry = new Gtk::Entry;
+ Gtk::Entry* an_entry = new Gtkmm2ext::FocusEntry;
+ an_entry->set_name ("EditorTrackNameDisplay");
Gtk::Requisition req;
an_entry->size_request (req);
name_label.set_size_request (-1, req.height);
time_axis_vbox.show();
time_axis_hbox.pack_start (time_axis_vbox, true, true);
time_axis_hbox.show();
- top_hbox.pack_start (scroomer_placeholder, false, false);
+ top_hbox.pack_start (scroomer_placeholder, false, false); // OR pack_end to move after meters ?
ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler));
TimeAxisView::~TimeAxisView()
{
+ CatchDeletion (this);
+
in_destructor = true;
for (list<GhostRegion*>::iterator i = ghosts.begin(); i != ghosts.end(); ++i) {
}
for (list<SelectionRect*>::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<SelectionRect*>::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;
delete _canvas_display;
_canvas_display = 0;
- delete _canvas_separator;
- _canvas_separator = 0;
-
delete display_menu;
display_menu = 0;
_order = nth;
if (_y_position != y) {
- _canvas_separator->set (ArdourCanvas::Duple(0, y), ArdourCanvas::Duple(ArdourCanvas::COORD_MAX, y));
- _canvas_display->set_y_position (y + 1);
+ _canvas_display->set_y_position (y);
_y_position = y;
}
_canvas_display->raise_to_top ();
_canvas_display->show ();
-
- _canvas_separator->raise_to_top ();
- _canvas_separator->show ();
-
+
_hidden = false;
_effective_height = current_height ();
}
}
+ /* put separator at the bottom of this time axis view */
+
+ _canvas_separator->set (ArdourCanvas::Duple(0, height), ArdourCanvas::Duple(ArdourCanvas::COORD_MAX, height));
+ _canvas_separator->lower_to_bottom ();
+ _canvas_separator->show ();
+
return _effective_height;
}
}
void
-TimeAxisView::idle_resize (uint32_t h)
+TimeAxisView::idle_resize (int32_t h)
{
- set_height (h);
+ set_height (std::max(0, h));
}
* are pretending that the drag is taking place over the canvas
* (which perhaps in the glorious future, when track headers
* and the canvas are unified, will actually be true.)
- */
+ */
_editor.maybe_autoscroll (false, true, true);
/* now schedule the actual TAV resize */
- int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
- _editor.add_to_idle_resize (this, delta);
- _resize_drag_start = ev->y_root;
- } else {
+ int32_t const delta = (int32_t) floor (ev->y_root - _resize_drag_start);
+ _editor.add_to_idle_resize (this, delta);
+ _resize_drag_start = ev->y_root;
+ _did_resize = true;
+ } else {
/* not dragging but ... */
maybe_set_cursor (ev->y);
}
}
_editor.stop_canvas_autoscroll ();
_resize_drag_start = -1;
+ if (_did_resize) {
+ _did_resize = false;
+ // don't change selection
+ return true;
+ }
}
if (!_ebox_release_can_act) {
}
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);
}
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 ();
}
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_canvasvar_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");
* @param result Filled in with selectable things.
*/
void
-TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list<Selectable*>& /*result*/)
+TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list<Selectable*>& /*result*/, bool /*within*/)
{
return;
}
window.add (one_row_table);
test_button->set_name ("mute button");
- test_button->set_text (_("M"));
+ test_button->set_text (S_("Mute|M"));
test_button->set_tweaks (ArdourButton::TrackHeader);
one_row_table.set_border_width (border_width);
for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
- (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectionRect());
- (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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_canvasvar_Selection());
- (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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_canvasvar_Selection());
- (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
- (*i)->rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_SelectionRect());
- (*i)->rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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_canvasvar_Selection());
- (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_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_canvasvar_Selection());
- (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->get_canvasvar_Selection());
+ (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("selection"));
+ (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("selection"));
}
}
return button_height + extra_height;
}
- /* NOTREACHED */
+ abort(); /* NOTREACHED */
return 0;
}