X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Ftime_axis_view.cc;h=2ce40844c5dd00fae4cee0ccbd8e52bf4d6f4839;hb=f2984260d481b7e2b641382e7d593ed701e464a3;hp=9deb7eb3e880946e8c124ed397cde4428c23d6b1;hpb=9c6a821c67139a32b531501e0fd000ec19c89faf;p=ardour.git diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 9deb7eb3e8..2ce40844c5 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -41,9 +41,7 @@ #include "ardour/profile.h" -#include "ardour_ui.h" #include "ardour_dialog.h" -#include "global_signals.h" #include "gui_thread.h" #include "public_editor.h" #include "time_axis_view.h" @@ -56,6 +54,8 @@ #include "streamview.h" #include "editor_drag.h" #include "editor.h" +#include "tooltips.h" +#include "ui_config.h" #include "i18n.h" @@ -83,7 +83,7 @@ Glib::RefPtr TimeAxisView::midi_scroomer_size_group = Glib::RefP void TimeAxisView::setup_sizes() { - name_width_px = ceilf (100.f * ARDOUR_UI::ui_scale); + name_width_px = ceilf (100.f * UIConfiguration::instance().get_ui_scale()); } TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/) @@ -96,7 +96,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie , parent (rent) , selection_group (0) , _ghost_group (0) - , _hidden (false) + , _hidden (true) , in_destructor (false) , _size_menu (0) , _canvas_display (0) @@ -104,6 +104,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie , _editor (ed) , name_entry (0) , ending_name_edit (false) + , by_popup_menu (false) , control_parent (0) , _order (0) , _effective_height (0) @@ -138,7 +139,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie CANVAS_DEBUG_NAME (selection_group, "selection for TAV"); selection_group->set_data (X_("timeselection"), (void *) 1); selection_group->hide(); - + _ghost_group = new ArdourCanvas::Container (_canvas_display); CANVAS_DEBUG_NAME (_ghost_group, "ghost for TAV"); _ghost_group->lower_to_bottom(); @@ -147,7 +148,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie name_label.set_name ("TrackLabel"); name_label.set_alignment (0.0, 0.5); name_label.set_width_chars (12); - ARDOUR_UI::instance()->set_tip (name_label, _("Track/Bus name (double click to edit)")); + set_tooltip (name_label, _("Track/Bus name (double click to edit)")); Gtk::Entry* an_entry = new Gtkmm2ext::FocusEntry; an_entry->set_name ("EditorTrackNameDisplay"); @@ -220,9 +221,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie time_axis_hbox.show(); top_hbox.pack_start (scroomer_placeholder, false, false); // OR pack_end to move after meters ? - ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler)); - - GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&TimeAxisView::erase_ghost, this, _1), gui_context()); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler)); } TimeAxisView::~TimeAxisView() @@ -319,7 +318,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent) _canvas_display->raise_to_top (); _canvas_display->show (); - + _hidden = false; _effective_height = current_height (); @@ -357,7 +356,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) } e.stepping_axis_view()->step_height (false); return true; - } + } break; case GDK_SCROLL_DOWN: @@ -369,7 +368,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev) } e.stepping_axis_view()->step_height (true); return true; - } + } break; default: @@ -407,7 +406,7 @@ TimeAxisView::controls_ebox_button_press (GdkEventButton* event) } _ebox_release_can_act = true; - + if (maybe_set_cursor (event->y) > 0) { _resize_drag_start = event->y_root; } @@ -654,10 +653,20 @@ TimeAxisView::name_entry_key_release (GdkEventKey* ev) bool TimeAxisView::name_entry_focus_out (GdkEventFocus*) { + if (by_popup_menu) { + by_popup_menu = false; + return false; + } end_name_edit (RESPONSE_OK); return false; } +void +TimeAxisView::name_entry_populate_popup (Gtk::Menu *) +{ + by_popup_menu = true; +} + void TimeAxisView::begin_name_edit () { @@ -668,7 +677,7 @@ TimeAxisView::begin_name_edit () if (can_edit_name()) { name_entry = manage (new Gtkmm2ext::FocusEntry); - + name_entry->set_width_chars(8); // min width, entry expands name_entry->set_name ("EditorTrackNameDisplay"); @@ -677,11 +686,12 @@ TimeAxisView::begin_name_edit () name_entry->signal_focus_out_event().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_focus_out)); name_entry->set_text (name_label.get_text()); name_entry->signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisView::end_name_edit), RESPONSE_OK)); + name_entry->signal_populate_popup().connect (sigc::mem_fun (*this, &TimeAxisView::name_entry_populate_popup)); if (name_label.is_ancestor (name_hbox)) { name_hbox.remove (name_label); } - + name_hbox.pack_end (*name_entry, true, true); name_entry->show (); @@ -700,14 +710,14 @@ TimeAxisView::end_name_edit (int response) } if (ending_name_edit) { - /* already doing this, and focus out or other event has caused + /* already doing this, and focus out or other event has caused us to re-enter this code. */ return; } - + PBD::Unwinder uw (ending_name_edit, true); - + bool edit_next = false; bool edit_prev = false; @@ -743,62 +753,62 @@ TimeAxisView::end_name_edit (int response) TrackViewList const & allviews = _editor.get_track_views (); TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this); - + if (i != allviews.end()) { - + do { if (++i == allviews.end()) { return; } - + RouteTimeAxisView* rtav = dynamic_cast(*i); - - if (rtav && rtav->route()->record_enabled()) { + + if (rtav && (!rtav->is_track() || rtav->track()->rec_enable_control()->get_value())) { continue; } - + if (!(*i)->hidden()) { break; } - + } while (true); } if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) { _editor.ensure_time_axis_view_is_visible (**i, false); (*i)->begin_name_edit (); - } + } } else if (edit_prev) { TrackViewList const & allviews = _editor.get_track_views (); TrackViewList::const_iterator i = find (allviews.begin(), allviews.end(), this); - + if (i != allviews.begin()) { do { if (i == allviews.begin()) { return; } - + --i; - + RouteTimeAxisView* rtav = dynamic_cast(*i); - - if (rtav && rtav->route()->record_enabled()) { + + if (rtav && (!rtav->is_track() || rtav->track()->rec_enable_control()->get_value())) { continue; } - + if (!(*i)->hidden()) { break; } - + } while (true); } - + if ((i != allviews.end()) && (*i != this) && !(*i)->hidden()) { _editor.ensure_time_axis_view_is_visible (**i, false); (*i)->begin_name_edit (); - } + } } } @@ -1056,7 +1066,7 @@ TimeAxisView::get_selection_rect (uint32_t id) rect->rect = new ArdourCanvas::Rectangle (selection_group); CANVAS_DEBUG_NAME (rect->rect, "selection rect"); rect->rect->set_outline (false); - rect->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect")); + rect->rect->set_fill_color (UIConfiguration::instance().color_mod ("selection rect", "selection rect")); rect->start_trim = new ArdourCanvas::Rectangle (selection_group); CANVAS_DEBUG_NAME (rect->start_trim, "selection rect start trim"); @@ -1221,26 +1231,26 @@ TimeAxisView::color_handler () for (list::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) { - (*i)->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect")); - (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("selection")); + (*i)->rect->set_fill_color (UIConfiguration::instance().color_mod ("selection rect", "selection rect")); + (*i)->rect->set_outline_color (UIConfiguration::instance().color ("selection")); + + (*i)->start_trim->set_fill_color (UIConfiguration::instance().color ("selection")); + (*i)->start_trim->set_outline_color (UIConfiguration::instance().color ("selection")); - (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("selection")); - (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("selection")); - - (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("selection")); - (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("selection")); + (*i)->end_trim->set_fill_color (UIConfiguration::instance().color ("selection")); + (*i)->end_trim->set_outline_color (UIConfiguration::instance().color ("selection")); } - + for (list::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) { - - (*i)->rect->set_fill_color (ARDOUR_UI::config()->color_mod ("selection rect", "selection rect")); - (*i)->rect->set_outline_color (ARDOUR_UI::config()->color ("selection")); - - (*i)->start_trim->set_fill_color (ARDOUR_UI::config()->color ("selection")); - (*i)->start_trim->set_outline_color (ARDOUR_UI::config()->color ("selection")); - - (*i)->end_trim->set_fill_color (ARDOUR_UI::config()->color ("selection")); - (*i)->end_trim->set_outline_color (ARDOUR_UI::config()->color ("selection")); + + (*i)->rect->set_fill_color (UIConfiguration::instance().color_mod ("selection rect", "selection rect")); + (*i)->rect->set_outline_color (UIConfiguration::instance().color ("selection")); + + (*i)->start_trim->set_fill_color (UIConfiguration::instance().color ("selection")); + (*i)->start_trim->set_outline_color (UIConfiguration::instance().color ("selection")); + + (*i)->end_trim->set_fill_color (UIConfiguration::instance().color ("selection")); + (*i)->end_trim->set_outline_color (UIConfiguration::instance().color ("selection")); } } @@ -1314,7 +1324,7 @@ TimeAxisView::covered_by_y_range (double y0, double y1) const /* if either the top or bottom of the axisview is in the vertical * range, we cover it. */ - + if ((y0 < _y_position && y1 < _y_position) || (y0 >= _y_position + height && y1 >= _y_position + height)) { return false; @@ -1392,7 +1402,7 @@ 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)); } else {