X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=c2774d5e4fbf77def5cf55c900b1e64560ad6db3;hb=c78528dcea03a61685ad0586eaa6302847af6fe9;hp=631f6428e5526cdcf2dd822619e541b4be804a46;hpb=c06c6c153db6b33b93515100d839f376dc805d5d;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 631f6428e5..c2774d5e4f 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" @@ -72,11 +73,13 @@ 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) + , _controls_padding_table (3, 3) + , _size_menu (0) + , _y_position (0) + , _editor (ed) + , _order (0) { if (extra_height == 0) { compute_heights (); @@ -87,6 +90,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); @@ -131,7 +135,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie name_hbox.show (); controls_table.set_size_request (200); - controls_table.set_border_width (2); controls_table.set_row_spacings (0); controls_table.set_col_spacings (0); controls_table.set_homogeneous (true); @@ -158,7 +161,16 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie HSeparator* separator = manage (new HSeparator()); - controls_vbox.pack_start (controls_table, false, false); + /* Use a rather hacky extra table so that we can control the space above/below and + * left/right of the controls_table separately. This in turn is so that we can + * shrink the vertical space when the track is at its minimum height. + */ + _controls_padding_table.set_row_spacings (2); + _controls_padding_table.set_col_spacings (0); + _controls_padding_table.attach (controls_table, 1, 2, 1, 2); + _controls_padding_table.show (); + + controls_vbox.pack_start (_controls_padding_table, false, false); controls_vbox.pack_end (resizer_box, false, false); controls_vbox.show (); @@ -214,6 +226,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. @@ -296,7 +310,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(); @@ -306,7 +320,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(); @@ -370,42 +384,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 = 25; - if (bigger) { - 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 == preset_height(HeightSmall)){ + if (coarser) { + + if (height == preset_height (HeightSmall)) { return; } if (height <= preset_height (HeightSmaller) && height > preset_height (HeightSmall)) { - set_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 <= preset_height (HeightNormal) && height > preset_height (HeightSmaller)){ - set_height (preset_height(HeightSmaller)); + + } else { + + if (height == preset_height(HeightSmall)) { + set_height_enum (HeightSmaller); + } else if (height == preset_height(HeightSmaller)) { + set_height_enum (HeightNormal); + } else { + set_height (height + step); } - else { - set_height (height - step); - } + } } @@ -420,14 +437,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; @@ -486,7 +511,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(); @@ -601,11 +626,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); } @@ -666,7 +689,7 @@ TimeAxisView::set_samples_per_unit (double spu) } 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); @@ -708,7 +731,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; @@ -910,7 +934,7 @@ TimeAxisView::add_ghost (RegionView* rv) { GhostRegion* gr = rv->add_ghost (*this); - if(gr) { + if (gr) { ghosts.push_back(gr); } } @@ -1008,20 +1032,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) { @@ -1030,14 +1054,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); @@ -1128,7 +1152,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(); } @@ -1168,7 +1192,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)) { @@ -1196,7 +1220,7 @@ TimeAxisView::covers_y_position (double y) } } - return std::make_pair ( (TimeAxisView *) 0, 0); + return std::make_pair ((TimeAxisView *) 0, 0); } bool @@ -1225,14 +1249,14 @@ TimeAxisView::resizer_motion (GdkEventMotion* ev) { if (_resize_drag_start >= 0) { /* (ab)use the DragManager to do autoscrolling; adjust the event coordinates - into the trackview space that DragManager::motion_handler is expecting, + 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_canvas_timebars_vsize (); + ev->y = ty - _editor.get_trackview_group_vertical_offset(); _editor.drags()->motion_handler ((GdkEvent *) ev, false); _editor.maybe_autoscroll (false, true); @@ -1320,3 +1344,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))); +}