X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=29cb3e613bef594fc4e4e4e3b013981c0a124bc7;hb=bb797943ddaae0a904b140fec58f6367fdf87d07;hp=43d9d4b41b06f2eae27e20d995ca4979e04851a1;hpb=a01dc9b6f252a582b2165b255eb5a80024379a8b;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 43d9d4b41b..29cb3e613b 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" @@ -86,6 +88,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 +205,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; @@ -382,16 +381,33 @@ TimeAxisView::hide () void TimeAxisView::step_height (bool bigger) { - static const uint32_t step = 20; + static const uint32_t step = 25; if (bigger) { - set_height (height + step); + if (height == preset_height(HeightSmall)) { + set_height (preset_height(HeightSmaller)); + } + else if (height == preset_height(HeightSmaller)) { + set_height (preset_height(HeightNormal)); + } + 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)){ + return; } + + if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) { + set_height (preset_height(HeightSmall)); + } + else if ( height <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)){ + set_height (preset_height(HeightSmaller)); + } + else { + set_height (height - step); + } } } @@ -412,8 +428,12 @@ TimeAxisView::set_height (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 +445,6 @@ TimeAxisView::set_height(uint32_t h) /* resize the selection rect */ show_selection (_editor.get_selection().time); } - - reshow_feature_lines (); } bool @@ -651,11 +669,6 @@ 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 @@ -724,12 +737,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 +838,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 +892,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; } @@ -968,6 +986,8 @@ TimeAxisView::get_parent_with_state () XMLNode& TimeAxisView::get_state () { + /* XXX: is this method used? */ + XMLNode* node = new XMLNode ("TAV-" + name()); char buf[32]; @@ -982,10 +1002,15 @@ TimeAxisView::set_state (const XMLNode& node, int /*version*/) { const XMLProperty *prop; + /* XXX: I think this might be vestigial */ if ((prop = node.property ("marked-for-display")) != 0) { _marked_for_display = (prop->value() == "1"); } + if ((prop = node.property ("shown-editor")) != 0) { + _marked_for_display = string_is_affirmative (prop->value ()); + } + if ((prop = node.property ("track-height")) != 0) { if (prop->value() == "largest") { @@ -1037,7 +1062,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); @@ -1180,51 +1205,6 @@ 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 (); - } -} - bool TimeAxisView::resizer_button_press (GdkEventButton* event) { @@ -1235,6 +1215,7 @@ TimeAxisView::resizer_button_press (GdkEventButton* event) bool TimeAxisView::resizer_button_release (GdkEventButton*) { + _editor.stop_canvas_autoscroll (); _resize_drag_start = -1; return true; } @@ -1249,6 +1230,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; @@ -1332,3 +1326,20 @@ 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; +} + +