X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=3032d834bfda4bacbef7fc21b9e17831d623195d;hb=99054ea415c8a28227024bc27152fdf30379bdf9;hp=9d2c56fd7cb3d995383dff0cc5b0d841ae62640f;hpb=86eb72955c76575b75a2b9e535162ca7e0612bfd;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 9d2c56fd7c..3032d834bf 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -35,6 +35,8 @@ #include "canvas/canvas.h" #include "canvas/rectangle.h" #include "canvas/debug.h" +#include "canvas/utils.h" +#include "canvas/colors.h" #include "ardour/profile.h" @@ -66,19 +68,27 @@ using namespace Editing; using namespace ArdourCanvas; using Gtkmm2ext::Keyboard; +#define TOP_LEVEL_WIDGET controls_ebox + 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::controls_button_size_group = Glib::RefPtr(); -Glib::RefPtr TimeAxisView::track_number_v_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) + , controls_button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_BOTH)) , _name_editing (false) , height (0) , display_menu (0) @@ -96,6 +106,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie , _order (0) , _effective_height (0) , _resize_drag_start (-1) + , _did_resize (false) , _preresize_cursor (0) , _have_preresize_cursor (false) , _ebox_release_can_act (true) @@ -103,23 +114,21 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie if (!controls_meters_size_group) { controls_meters_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL); } - if (!track_number_v_size_group) { - track_number_v_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL); - } - if (!controls_button_size_group) { - controls_button_size_group = SizeGroup::create (Gtk::SIZE_GROUP_BOTH); + if (!midi_scroomer_size_group) { + midi_scroomer_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL); } if (extra_height == 0) { 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(); @@ -138,7 +147,8 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie 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); @@ -171,7 +181,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie top_hbox.pack_start (controls_vbox, true, true); top_hbox.show (); - controls_ebox.add (top_hbox); + controls_ebox.add (time_axis_hbox); controls_ebox.add_events (Gdk::BUTTON_PRESS_MASK| Gdk::BUTTON_RELEASE_MASK| Gdk::POINTER_MOTION_MASK| @@ -189,7 +199,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie controls_ebox.show (); time_axis_frame.set_shadow_type (Gtk::SHADOW_NONE); - time_axis_frame.add(controls_ebox); + time_axis_frame.add(top_hbox); time_axis_frame.show(); HSeparator* separator = manage (new HSeparator()); @@ -197,11 +207,16 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie separator->set_size_request(-1, 1); separator->show(); + scroomer_placeholder.set_size_request (-1, -1); + scroomer_placeholder.show(); + midi_scroomer_size_group->add_widget (scroomer_placeholder); + time_axis_vbox.pack_start (*separator, false, false); time_axis_vbox.pack_start (time_axis_frame, true, true); 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); // OR pack_end to move after meters ? ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler)); @@ -210,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) { @@ -217,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; @@ -235,9 +252,6 @@ TimeAxisView::~TimeAxisView() delete _canvas_display; _canvas_display = 0; - delete _canvas_separator; - _canvas_separator = 0; - delete display_menu; display_menu = 0; @@ -255,7 +269,7 @@ TimeAxisView::hide () _canvas_separator->hide (); if (control_parent) { - control_parent->remove (time_axis_hbox); + control_parent->remove (TOP_LEVEL_WIDGET); control_parent = 0; } @@ -287,27 +301,23 @@ guint32 TimeAxisView::show_at (double y, int& nth, VBox *parent) { if (control_parent) { - control_parent->reorder_child (time_axis_hbox, nth); + control_parent->reorder_child (TOP_LEVEL_WIDGET, nth); } else { control_parent = parent; - parent->pack_start (time_axis_hbox, false, false); - parent->reorder_child (time_axis_hbox, nth); + parent->pack_start (TOP_LEVEL_WIDGET, false, false); + parent->reorder_child (TOP_LEVEL_WIDGET, nth); } _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 (); @@ -323,6 +333,12 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent) } } + /* 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; } @@ -398,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)); } @@ -413,15 +429,16 @@ TimeAxisView::controls_ebox_motion (GdkEventMotion* ev) * 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); } @@ -479,6 +496,11 @@ TimeAxisView::controls_ebox_button_release (GdkEventButton* ev) } _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) { @@ -552,7 +574,7 @@ TimeAxisView::set_height (uint32_t h) h = preset_height (HeightSmall); } - time_axis_hbox.property_height_request () = h; + TOP_LEVEL_WIDGET.property_height_request () = h; height = h; char buf[32]; @@ -1006,10 +1028,10 @@ TimeAxisView::get_selection_rect (uint32_t id) rect = new SelectionRect; - rect->rect = new ArdourCanvas::Rectangle (selection_group); + rect->rect = new ArdourCanvas::TimeRectangle (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"); @@ -1066,7 +1088,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; } @@ -1152,6 +1174,7 @@ TimeAxisView::compute_heights () window.add (one_row_table); test_button->set_name ("mute button"); test_button->set_text (_("M")); + test_button->set_tweaks (ArdourButton::TrackHeader); one_row_table.set_border_width (border_width); one_row_table.set_row_spacings (2); @@ -1173,26 +1196,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_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::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")); } } @@ -1297,7 +1320,7 @@ TimeAxisView::preset_height (Height h) return button_height + extra_height; } - /* NOTREACHED */ + abort(); /* NOTREACHED */ return 0; }