X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=380b4b4c5691216642f00916a45f8fb7825c4b9d;hb=b691ba816f3080d0f8029beac6d0ff4c4c3a1900;hp=6dc1382c3d393072add7d44129dc84cecb4acab7;hpb=fde56cc730cc4d0fad1bccd19f9ebdae90ce0deb;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 6dc1382c3d..380b4b4c56 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -73,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 (); @@ -216,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. @@ -298,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(); @@ -308,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(); @@ -379,36 +382,38 @@ TimeAxisView::hide () 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); - } + } } @@ -423,9 +428,13 @@ 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 @@ -493,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(); @@ -608,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); } @@ -918,7 +925,7 @@ TimeAxisView::add_ghost (RegionView* rv) { GhostRegion* gr = rv->add_ghost (*this); - if(gr) { + if (gr) { ghosts.push_back(gr); } } @@ -1016,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) { @@ -1038,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); @@ -1136,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(); } @@ -1176,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)) { @@ -1204,7 +1211,7 @@ TimeAxisView::covers_y_position (double y) } } - return std::make_pair ( (TimeAxisView *) 0, 0); + return std::make_pair ((TimeAxisView *) 0, 0); } bool @@ -1344,4 +1351,25 @@ TimeAxisView::get_child_list () 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))); +}