X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=380b4b4c5691216642f00916a45f8fb7825c4b9d;hb=5c4f7313ef3f5f56dbc5777a0f78061c5472b29e;hp=978ce6debba905a3eb99df60f7f7f7f4bebbcd9a;hpb=a8e019c9e0a0fcbbe9aa75f25dba90ca1a5eda2b;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 978ce6debb..380b4b4c56 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -40,6 +40,7 @@ #include "ardour/location.h" #include "ardour_ui.h" +#include "global_signals.h" #include "gui_thread.h" #include "public_editor.h" #include "time_axis_view.h" @@ -52,6 +53,7 @@ #include "rgb_macros.h" #include "utils.h" #include "streamview.h" +#include "editor_drag.h" #include "i18n.h" @@ -71,11 +73,12 @@ int const TimeAxisView::_max_order = 512; PBD::Signal1 TimeAxisView::CatchDeletion; TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/) - : AxisView (sess), - controls_table (2, 8), - _y_position (0), - _editor (ed), - _order (0) + : AxisView (sess) + , controls_table (2, 8) + , _size_menu (0) + , _y_position (0) + , _editor (ed) + , _order (0) { if (extra_height == 0) { compute_heights (); @@ -86,6 +89,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie _canvas_display->hide(); // reveal as needed selection_group = new Group (*_canvas_display); + selection_group->set_data (X_("timeselection"), (void *) 1); selection_group->hide(); _ghost_group = new Group (*_canvas_display); @@ -202,10 +206,6 @@ TimeAxisView::~TimeAxisView() delete (*i)->end_trim; } - for (list::iterator i = feature_lines.begin(); i != feature_lines.end(); ++i) { - delete (*i); - } - delete selection_group; selection_group = 0; @@ -217,6 +217,8 @@ TimeAxisView::~TimeAxisView() delete display_menu; display_menu = 0; + + delete _size_menu; } /** Display this TimeAxisView as the nth component of the parent box, at y. @@ -299,7 +301,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) switch (ev->direction) { case GDK_SCROLL_UP: if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - step_height (true); + step_height (false); return true; } else if (Keyboard::no_modifiers_active (ev->state)) { _editor.scroll_tracks_up_line(); @@ -309,7 +311,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) case GDK_SCROLL_DOWN: if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { - step_height (false); + step_height (true); return true; } else if (Keyboard::no_modifiers_active (ev->state)) { _editor.scroll_tracks_down_line(); @@ -373,25 +375,45 @@ TimeAxisView::hide () } /* if its hidden, it cannot be selected */ - _editor.get_selection().remove (this); + /* and neither can its regions */ + _editor.get_selection().remove_regions (this); Hiding (); } +/** Steps through the defined heights for this TrackView. + * @param coarser true if stepping should decrease in size, otherwise false. + */ void -TimeAxisView::step_height (bool bigger) +TimeAxisView::step_height (bool coarser) { - static const uint32_t step = 20; + static const uint32_t step = 25; - if (bigger) { - set_height (height + step); + if (coarser) { + + if (height == preset_height (HeightSmall)) { + return; + } + + if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) { + set_height_enum (HeightSmall); + } else if (height <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)) { + set_height_enum (HeightSmaller); + } else { + set_height (height - step); + } + } else { - if (height > step) { - set_height (std::max (height - step, preset_height (HeightSmall))); - } else if (height != preset_height (HeightSmall)) { - set_height (HeightSmall); + + if (height == preset_height(HeightSmall)) { + set_height_enum (HeightSmaller); + } else if (height == preset_height(HeightSmaller)) { + set_height_enum (HeightNormal); + } else { + set_height (height + step); } + } } @@ -406,14 +428,22 @@ TimeAxisView::set_heights (uint32_t h) } void -TimeAxisView::set_height (Height h) +TimeAxisView::set_height_enum (Height h, bool apply_to_selection) { - set_height (preset_height (h)); + if (apply_to_selection) { + _editor.get_selection().tracks.foreach_time_axis (boost::bind (&TimeAxisView::set_height_enum, _1, h, false)); + } else { + set_height (preset_height (h)); + } } void -TimeAxisView::set_height(uint32_t h) +TimeAxisView::set_height (uint32_t h) { + if (h < preset_height (HeightSmall)) { + h = preset_height (HeightSmall); + } + time_axis_vbox.property_height_request () = h; height = h; @@ -425,8 +455,6 @@ TimeAxisView::set_height(uint32_t h) /* resize the selection rect */ show_selection (_editor.get_selection().time); } - - reshow_feature_lines (); } bool @@ -474,7 +502,7 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev) /* resize to show editable name display */ if ((*i)->current_height() <= preset_height (HeightSmaller)) { - (*i)->set_height (HeightSmaller); + (*i)->set_height_enum (HeightSmaller); } (*i)->name_entry.grab_focus(); @@ -589,11 +617,9 @@ TimeAxisView::conditionally_add_to_selection () void TimeAxisView::popup_display_menu (guint32 when) { - if (display_menu == 0) { - build_display_menu (); - } - conditionally_add_to_selection (); + + build_display_menu (); display_menu->popup (1, when); } @@ -651,15 +677,10 @@ TimeAxisView::set_samples_per_unit (double spu) AnalysisFeatureList::const_iterator i; list::iterator l; - - for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) { - (*l)->property_x1() = _editor.frame_to_pixel (*i); - (*l)->property_x2() = _editor.frame_to_pixel (*i); - } } void -TimeAxisView::show_timestretch (nframes_t start, nframes_t end) +TimeAxisView::show_timestretch (framepos_t start, framepos_t end) { for (Children::iterator i = children.begin(); i != children.end(); ++i) { (*i)->show_timestretch (start, end); @@ -701,7 +722,8 @@ TimeAxisView::show_selection (TimeSelection& ts) selection_group->raise_to_top(); for (list::iterator i = ts.begin(); i != ts.end(); ++i) { - nframes_t start, end, cnt; + framepos_t start, end; + framecnt_t cnt; start = (*i).start; end = (*i).end; @@ -724,12 +746,12 @@ TimeAxisView::show_selection (TimeSelection& ts) rect->start_trim->property_x1() = x1; rect->start_trim->property_y1() = 1.0; rect->start_trim->property_x2() = x1 + trim_handle_size; - rect->start_trim->property_y2() = 1.0 + trim_handle_size; + rect->start_trim->property_y2() = y2; rect->end_trim->property_x1() = x2 - trim_handle_size; rect->end_trim->property_y1() = 1.0; rect->end_trim->property_x2() = x2; - rect->end_trim->property_y2() = 1.0 + trim_handle_size; + rect->end_trim->property_y2() = y2; rect->start_trim->show(); rect->end_trim->show(); @@ -825,24 +847,22 @@ TimeAxisView::get_selection_rect (uint32_t id) rect = new SelectionRect; rect->rect = new SimpleRect (*selection_group); + rect->rect->property_outline_what() = 0x0; rect->rect->property_x1() = 0.0; rect->rect->property_y1() = 0.0; rect->rect->property_x2() = 0.0; rect->rect->property_y2() = 0.0; rect->rect->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectionRect.get(); - rect->rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); rect->start_trim = new SimpleRect (*selection_group); + rect->start_trim->property_outline_what() = 0x0; rect->start_trim->property_x1() = 0.0; rect->start_trim->property_x2() = 0.0; - rect->start_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - rect->start_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - + rect->end_trim = new SimpleRect (*selection_group); + rect->end_trim->property_outline_what() = 0x0; rect->end_trim->property_x1() = 0.0; rect->end_trim->property_x2() = 0.0; - rect->end_trim->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); - rect->end_trim->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_Selection.get(); free_selection_rects.push_front (rect); @@ -881,8 +901,15 @@ TimeAxisView::remove_child (boost::shared_ptr child) } } +/** Get selectable things within a given range. + * @param start Start time in session frames. + * @param end End time in session frames. + * @param top Top y range, in trackview coordinates (ie 0 is the top of the track view) + * @param bot Bottom y range, in trackview coordinates (ie 0 is the top of the track view) + * @param result Filled in with selectable things. + */ void -TimeAxisView::get_selectables (nframes_t /*start*/, nframes_t /*end*/, double /*top*/, double /*bot*/, list& /*result*/) +TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list& /*result*/) { return; } @@ -898,7 +925,7 @@ TimeAxisView::add_ghost (RegionView* rv) { GhostRegion* gr = rv->add_ghost (*this); - if(gr) { + if (gr) { ghosts.push_back(gr); } } @@ -996,20 +1023,20 @@ TimeAxisView::set_state (const XMLNode& node, int /*version*/) if ((prop = node.property ("track-height")) != 0) { if (prop->value() == "largest") { - set_height (HeightLargest); + set_height_enum (HeightLargest); } else if (prop->value() == "large") { - set_height (HeightLarge); + set_height_enum (HeightLarge); } else if (prop->value() == "larger") { - set_height (HeightLarger); + set_height_enum (HeightLarger); } else if (prop->value() == "normal") { - set_height (HeightNormal); + set_height_enum (HeightNormal); } else if (prop->value() == "smaller") { - set_height (HeightSmaller); + set_height_enum (HeightSmaller); } else if (prop->value() == "small") { - set_height (HeightSmall); + set_height_enum (HeightSmall); } else { error << string_compose(_("unknown track height name \"%1\" in XML GUI information"), prop->value()) << endmsg; - set_height (HeightNormal); + set_height_enum (HeightNormal); } } else if ((prop = node.property ("height")) != 0) { @@ -1018,14 +1045,14 @@ TimeAxisView::set_state (const XMLNode& node, int /*version*/) } else { - set_height (HeightNormal); + set_height_enum (HeightNormal); } return 0; } void -TimeAxisView::reset_height() +TimeAxisView::reset_height () { set_height (height); @@ -1044,7 +1071,7 @@ TimeAxisView::compute_heights () const int border_width = 2; extra_height = (2 * border_width) //+ 2 // 2 pixels for the hseparator between TimeAxisView control areas - + 10; // resizer button (3 x 2 pixel elements + 2 x 2 pixel gaps) + + 6; // resizer button (3 x 2 pixel elements + 2 x 2 pixel gaps) window.add (one_row_table); @@ -1116,7 +1143,7 @@ TimeAxisView::hide_name_entry () void TimeAxisView::color_handler () { - for (list::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) { + for (list::iterator i = ghosts.begin(); i != ghosts.end(); i++) { (*i)->set_colors(); } @@ -1156,7 +1183,7 @@ std::pair TimeAxisView::covers_y_position (double y) { if (hidden()) { - return std::make_pair ( (TimeAxisView *) 0, 0); + return std::make_pair ((TimeAxisView *) 0, 0); } if (_y_position <= y && y < (_y_position + height)) { @@ -1184,52 +1211,7 @@ TimeAxisView::covers_y_position (double y) } } - return std::make_pair ( (TimeAxisView *) 0, 0); -} - -void -TimeAxisView::show_feature_lines (const AnalysisFeatureList& pos) -{ - analysis_features = pos; - reshow_feature_lines (); -} - - -void -TimeAxisView::hide_feature_lines () -{ - list::iterator l; - - for (l = feature_lines.begin(); l != feature_lines.end(); ++l) { - (*l)->hide(); - } -} - -void -TimeAxisView::reshow_feature_lines () -{ - while (feature_lines.size()< analysis_features.size()) { - ArdourCanvas::SimpleLine* l = new ArdourCanvas::SimpleLine (*_canvas_display); - l->property_color_rgba() = (guint) ARDOUR_UI::config()->canvasvar_ZeroLine.get(); - feature_lines.push_back (l); - } - - while (feature_lines.size() > analysis_features.size()) { - ArdourCanvas::SimpleLine *line = feature_lines.back(); - feature_lines.pop_back (); - delete line; - } - - AnalysisFeatureList::const_iterator i; - list::iterator l; - - for (i = analysis_features.begin(), l = feature_lines.begin(); i != analysis_features.end() && l != feature_lines.end(); ++i, ++l) { - (*l)->property_x1() = _editor.frame_to_pixel (*i); - (*l)->property_x2() = _editor.frame_to_pixel (*i); - (*l)->property_y1() = 0; - (*l)->property_y2() = current_height(); - (*l)->show (); - } + return std::make_pair ((TimeAxisView *) 0, 0); } bool @@ -1242,6 +1224,7 @@ TimeAxisView::resizer_button_press (GdkEventButton* event) bool TimeAxisView::resizer_button_release (GdkEventButton*) { + _editor.stop_canvas_autoscroll (); _resize_drag_start = -1; return true; } @@ -1256,6 +1239,19 @@ bool TimeAxisView::resizer_motion (GdkEventMotion* ev) { if (_resize_drag_start >= 0) { + /* (ab)use the DragManager to do autoscrolling; adjust the event coordinates + into the world coordinate space that DragManager::motion_handler is expecting, + and then fake a DragManager motion event so that when maybe_autoscroll + asks DragManager for the current pointer position it will get the correct + answers. + */ + int tx, ty; + resizer.translate_coordinates (*control_parent, ev->x, ev->y, tx, ty); + ev->y = ty - _editor.get_trackview_group_vertical_offset(); + _editor.drags()->motion_handler ((GdkEvent *) ev, false); + _editor.maybe_autoscroll (false, true); + + /* now do 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; @@ -1339,3 +1335,41 @@ TimeAxisView::preset_height (Height h) /* NOTREACHED */ return 0; } + +/** @return Child time axis views that are not hidden */ +TimeAxisView::Children +TimeAxisView::get_child_list () +{ + Children c; + + for (Children::iterator i = children.begin(); i != children.end(); ++i) { + if (!(*i)->hidden()) { + c.push_back(*i); + } + } + + return c; +} + +void +TimeAxisView::build_size_menu () +{ + if (_size_menu && _size_menu->gobj ()) { + return; + } + + delete _size_menu; + + using namespace Menu_Helpers; + + _size_menu = new Menu; + _size_menu->set_name ("ArdourContextMenu"); + MenuList& items = _size_menu->items(); + + items.push_back (MenuElem (_("Largest"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLargest, true))); + items.push_back (MenuElem (_("Larger"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLarger, true))); + items.push_back (MenuElem (_("Large"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightLarge, true))); + items.push_back (MenuElem (_("Normal"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightNormal, true))); + items.push_back (MenuElem (_("Smaller"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightSmaller, true))); + items.push_back (MenuElem (_("Small"), sigc::bind (sigc::mem_fun (*this, &TimeAxisView::set_height_enum), HeightSmall, true))); +}