X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view.cc;h=1dd61338a5616d3b3af34f156946f92d6d466d1b;hb=a2fefe68db911fb514f463557d23213c8bae1fda;hp=f97a1e8c515e9b5a2a3215da929c49126ae1de5b;hpb=43b6a7aca36b81c6ff95f33b7ff23f3413490c04;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index f97a1e8c51..1dd61338a5 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -23,23 +23,25 @@ #include #include +#include #include "pbd/error.h" #include "pbd/convert.h" #include "pbd/stacktrace.h" #include "pbd/unwind.h" -#include -#include -#include +#include "ardour/profile.h" + +#include "gtkmm2ext/colors.h" +#include "gtkmm2ext/doi.h" +#include "gtkmm2ext/utils.h" #include "canvas/canvas.h" #include "canvas/rectangle.h" #include "canvas/debug.h" #include "canvas/utils.h" -#include "canvas/colors.h" -#include "ardour/profile.h" +#include "widgets/tooltips.h" #include "ardour_dialog.h" #include "floating_text_entry.h" @@ -55,19 +57,18 @@ #include "streamview.h" #include "editor_drag.h" #include "editor.h" -#include "tooltips.h" #include "ui_config.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace Gtk; using namespace Gdk; using namespace ARDOUR; -using namespace ARDOUR_UI_UTILS; using namespace PBD; using namespace Editing; using namespace ArdourCanvas; +using namespace ArdourWidgets; using Gtkmm2ext::Keyboard; #define TOP_LEVEL_WIDGET controls_ebox @@ -88,8 +89,7 @@ TimeAxisView::setup_sizes() } TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/) - : AxisView (sess) - , controls_table (5, 4) + : controls_table (5, 4) , controls_button_size_group (Gtk::SizeGroup::create (Gtk::SIZE_GROUP_BOTH)) , _name_editing (false) , height (0) @@ -129,7 +129,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie _canvas_separator = new ArdourCanvas::Line(_canvas_display); CANVAS_DEBUG_NAME (_canvas_separator, "separator for TAV"); _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_color(Gtkmm2ext::rgba_to_color (0, 0, 0, 1.0)); _canvas_separator->set_outline_width(1.0); _canvas_separator->hide(); @@ -148,20 +148,19 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie name_label.set_width_chars (12); set_tooltip (name_label, _("Track/Bus name (double click to edit)")); - 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); - name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE); - delete an_entry; + { + std::auto_ptr an_entry (new FocusEntry); + an_entry->set_name (X_("TrackNameEditor")); + Gtk::Requisition req; + an_entry->size_request (req); - name_hbox.pack_end (name_label, true, true); + name_label.set_size_request (-1, req.height); + name_label.set_ellipsize (Pango::ELLIPSIZE_MIDDLE); + } // set min. track-header width if fader is not visible - name_hbox.set_size_request(name_width_px, -1); + name_label.set_size_request(name_width_px, -1); - name_hbox.show (); name_label.show (); controls_table.set_row_spacings (2); @@ -169,10 +168,11 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie controls_table.set_border_width (2); if (ARDOUR::Profile->get_mixbus() ) { - controls_table.attach (name_hbox, 4, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); + controls_table.attach (name_label, 4, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); } else { - controls_table.attach (name_hbox, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); + controls_table.attach (name_label, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK, 0, 0); } + controls_table.show_all (); controls_table.set_no_show_all (); @@ -294,6 +294,7 @@ TimeAxisView::hide () * @param y y position. * @param nth index for this TimeAxisView, increased if this view has children. * @param parent parent component. +* * @return height of this TimeAxisView. */ guint32 @@ -332,6 +333,10 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent) } } + for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { + (*i)->set_height (); + } + /* put separator at the bottom of this time axis view */ _canvas_separator->set (ArdourCanvas::Duple(0, height), ArdourCanvas::Duple(ArdourCanvas::COORD_MAX, height)); @@ -586,9 +591,7 @@ TimeAxisView::set_height (uint32_t h, TrackHeightMode m) TOP_LEVEL_WIDGET.property_height_request () = h; height = h; - char buf[32]; - snprintf (buf, sizeof (buf), "%u", height); - set_gui_property ("height", buf); + set_gui_property ("height", height); for (list::iterator i = ghosts.begin(); i != ghosts.end(); ++i) { (*i)->set_height (); @@ -616,7 +619,7 @@ TimeAxisView::begin_name_edit () } Gtk::Window* toplevel = (Gtk::Window*) control_parent->get_toplevel(); - FloatingTextEntry* fte = new FloatingTextEntry (toplevel, name_label.get_text ()); + FloatingTextEntry* fte = new FloatingTextEntry (toplevel, name ()); fte->set_name ("TrackNameEditor"); fte->use_text.connect (sigc::mem_fun (*this, &TimeAxisView::end_name_edit)); @@ -627,12 +630,12 @@ TimeAxisView::begin_name_edit () */ int x, y; - int wx, wy; + int wx, wy; - name_label.translate_coordinates (*toplevel, 0, 0, x, y); - toplevel->get_window()->get_origin (wx, wy); + name_label.translate_coordinates (*toplevel, 0, 0, x, y); + toplevel->get_window()->get_origin (wx, wy); - fte->move (wx + x, wy + y); + fte->move (wx + x, wy + y); fte->present (); } @@ -738,24 +741,20 @@ TimeAxisView::popup_display_menu (guint32 when) conditionally_add_to_selection (); build_display_menu (); - display_menu->popup (1, when); + + if (!display_menu->items().empty()) { + display_menu->popup (1, when); + } } void TimeAxisView::set_selected (bool yn) { -#if 0 - /* end any name edit in progress */ - if (can_edit_name()) { - end_name_edit (string(), 0); - } -#endif - - if (yn == _selected) { + if (yn == selected()) { return; } - Selectable::set_selected (yn); + AxisView::set_selected (yn); if (_selected) { time_axis_frame.set_shadow_type (Gtk::SHADOW_IN); @@ -771,19 +770,9 @@ TimeAxisView::set_selected (bool yn) time_axis_vbox.set_name (controls_base_unselected_name); hide_selection (); - - /* children will be set for the yn=true case. but when deselecting - the editor only has a list of top-level trackviews, so we - have to do this here. - */ - - for (Children::iterator i = children.begin(); i != children.end(); ++i) { - (*i)->set_selected (false); - } } time_axis_frame.show(); - } void @@ -833,6 +822,9 @@ TimeAxisView::show_selection (TimeSelection& ts) for (Children::iterator i = children.begin(); i != children.end(); ++i) { + if (!(*i)->selected () && !(*i)->propagate_time_selection ()) { + continue; + } (*i)->show_selection (ts); } @@ -890,6 +882,9 @@ TimeAxisView::reshow_selection (TimeSelection& ts) show_selection (ts); for (Children::iterator i = children.begin(); i != children.end(); ++i) { + if (!(*i)->selected () && !(*i)->propagate_time_selection ()) { + continue; + } (*i)->show_selection (ts); } } @@ -936,6 +931,8 @@ TimeAxisView::order_selection_trims (ArdourCanvas::Item *item, bool put_start_on } } +// retuned rect is pushed back into the used_selection_rects list +// in TimeAxisView::show_selection() which is the only caller. SelectionRect * TimeAxisView::get_selection_rect (uint32_t id) { @@ -945,7 +942,9 @@ TimeAxisView::get_selection_rect (uint32_t id) for (list::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) { if ((*i)->id == id) { - return (*i); + SelectionRect* ret = (*i); + used_selection_rects.erase (i); + return ret; } } @@ -1025,15 +1024,31 @@ 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*/, bool /*within*/) +TimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list& results, bool within) +{ + for (Children::iterator i = children.begin(); i != children.end(); ++i) { + if (!(*i)->hidden()) { + (*i)->get_selectables (start, end, top, bot, results, within); + } + } +} + +void +TimeAxisView::set_selected_points (PointSelection& points) { - return; + for (Children::iterator i = children.begin(); i != children.end(); ++i) { + (*i)->set_selected_points (points); + } } void -TimeAxisView::get_inverted_selectables (Selection& /*sel*/, list& /*result*/) +TimeAxisView::get_inverted_selectables (Selection& sel, list& results) { - return; + for (Children::iterator i = children.begin(); i != children.end(); ++i) { + if (!(*i)->hidden()) { + (*i)->get_inverted_selectables (sel, results); + } + } } void @@ -1263,11 +1278,11 @@ TimeAxisView::preset_height (Height h) /** @return Child time axis views that are not hidden */ TimeAxisView::Children -TimeAxisView::get_child_list () +TimeAxisView::get_child_list () const { Children c; - for (Children::iterator i = children.begin(); i != children.end(); ++i) { + for (Children::const_iterator i = children.begin(); i != children.end(); ++i) { if (!(*i)->hidden()) { c.push_back(*i); } @@ -1303,10 +1318,9 @@ TimeAxisView::reset_visual_state () { /* this method is not required to trigger a global redraw */ - string str = gui_property ("height"); - - if (!str.empty()) { - set_height (atoi (str)); + uint32_t height; + if (get_gui_property ("height", height)) { + set_height (height); } else { set_height (preset_height (HeightNormal)); }