cont'd work & fix bug introduced in 03660573e
[ardour.git] / gtk2_ardour / time_axis_view.cc
index 7130f9de68a87501dcd782eda4c41c2f1282c32b..6b780a7fc7e899b9ed4fecace543687b568a3134 100644 (file)
@@ -27,6 +27,7 @@
 #include "pbd/error.h"
 #include "pbd/convert.h"
 #include "pbd/stacktrace.h"
+#include "pbd/unwind.h"
 
 #include <gtkmm2ext/doi.h>
 #include <gtkmm2ext/utils.h>
@@ -40,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"
@@ -55,6 +54,8 @@
 #include "streamview.h"
 #include "editor_drag.h"
 #include "editor.h"
+#include "tooltips.h"
+#include "ui_config.h"
 
 #include "i18n.h"
 
@@ -74,11 +75,17 @@ const double trim_handle_size = 6.0; /* pixels */
 uint32_t TimeAxisView::button_height = 0;
 uint32_t TimeAxisView::extra_height = 0;
 int const TimeAxisView::_max_order = 512;
-unsigned int TimeAxisView::name_width_px = 100; // TODO adjust with font-scaling on style-change
+unsigned int TimeAxisView::name_width_px = 100;
 PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion;
 Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::controls_meters_size_group = Glib::RefPtr<Gtk::SizeGroup>();
 Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::midi_scroomer_size_group = Glib::RefPtr<Gtk::SizeGroup>();
 
+void
+TimeAxisView::setup_sizes()
+{
+       name_width_px = ceilf (100.f * UIConfiguration::instance().get_ui_scale());
+}
+
 TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* rent, Canvas& /*canvas*/)
        : AxisView (sess)
        , controls_table (3, 3)
@@ -89,13 +96,15 @@ 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)
        , _y_position (0)
        , _editor (ed)
        , name_entry (0)
+       , ending_name_edit (false)
+       , by_popup_menu (false)
        , control_parent (0)
        , _order (0)
        , _effective_height (0)
@@ -130,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();
@@ -139,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");
@@ -212,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()
@@ -228,16 +235,16 @@ TimeAxisView::~TimeAxisView()
        }
 
        for (list<SelectionRect*>::iterator i = free_selection_rects.begin(); i != free_selection_rects.end(); ++i) {
-               delete (*i)->rect;
-               delete (*i)->start_trim;
-               delete (*i)->end_trim;
+               delete (*i)->rect; (*i)->rect=0;
+               delete (*i)->start_trim; (*i)->start_trim = 0;
+               delete (*i)->end_trim; (*i)->end_trim = 0;
 
        }
 
        for (list<SelectionRect*>::iterator i = used_selection_rects.begin(); i != used_selection_rects.end(); ++i) {
-               delete (*i)->rect;
-               delete (*i)->start_trim;
-               delete (*i)->end_trim;
+               delete (*i)->rect; (*i)->rect = 0;
+               delete (*i)->start_trim; (*i)->start_trim = 0;
+               delete (*i)->end_trim; (*i)->end_trim = 0;
        }
 
        delete selection_group;
@@ -311,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 ();
@@ -349,7 +356,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
                        }
                        e.stepping_axis_view()->step_height (false);
                        return true;
-               } 
+               }
                break;
 
        case GDK_SCROLL_DOWN:
@@ -361,7 +368,7 @@ TimeAxisView::controls_ebox_scroll (GdkEventScroll* ev)
                        }
                        e.stepping_axis_view()->step_height (true);
                        return true;
-               } 
+               }
                break;
 
        default:
@@ -399,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;
        }
@@ -562,8 +569,16 @@ TimeAxisView::set_height_enum (Height h, bool apply_to_selection)
 }
 
 void
-TimeAxisView::set_height (uint32_t h)
+TimeAxisView::set_height (uint32_t h, TrackHeightMode m)
 {
+       uint32_t lanes = 0;
+       if (m == TotalHeight) {
+               for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+                       if ( !(*i)->hidden()) ++lanes;
+               }
+       }
+       h /= (lanes + 1);
+
        if (h < preset_height (HeightSmall)) {
                h = preset_height (HeightSmall);
        }
@@ -584,6 +599,12 @@ TimeAxisView::set_height (uint32_t h)
                show_selection (_editor.get_selection().time);
        }
 
+       if (m != OnlySelf) {
+               for (Children::iterator i = children.begin(); i != children.end(); ++i) {
+                       (*i)->set_height(h, OnlySelf);
+               }
+       }
+
        _editor.override_visible_track_count ();
 }
 
@@ -632,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 ()
 {
@@ -646,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");
@@ -655,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 ();
 
@@ -676,7 +708,16 @@ TimeAxisView::end_name_edit (int response)
        if (!name_entry) {
                return;
        }
-       
+
+       if (ending_name_edit) {
+               /* already doing this, and focus out or other event has caused
+                  us to re-enter this code.
+               */
+               return;
+       }
+
+       PBD::Unwinder<bool> uw (ending_name_edit, true);
+
        bool edit_next = false;
        bool edit_prev = false;
 
@@ -712,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<RouteTimeAxisView*>(*i);
-                       
+
                                if (rtav && rtav->route()->record_enabled()) {
                                        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<RouteTimeAxisView*>(*i);
-                               
+
                                if (rtav && rtav->route()->record_enabled()) {
                                        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 ();
-               } 
+               }
        }
 }
 
@@ -1022,10 +1063,10 @@ TimeAxisView::get_selection_rect (uint32_t id)
 
                rect = new SelectionRect;
 
-               rect->rect = new ArdourCanvas::TimeRectangle (selection_group);
+               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");
@@ -1082,7 +1123,7 @@ TimeAxisView::remove_child (boost::shared_ptr<TimeAxisView> child)
  *  @param result Filled in with selectable things.
  */
 void
-TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list<Selectable*>& /*result*/)
+TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list<Selectable*>& /*result*/, bool /*within*/)
 {
        return;
 }
@@ -1167,7 +1208,7 @@ TimeAxisView::compute_heights ()
 
        window.add (one_row_table);
        test_button->set_name ("mute button");
-       test_button->set_text (_("M"));
+       test_button->set_text (S_("Mute|M"));
        test_button->set_tweaks (ArdourButton::TrackHeader);
 
        one_row_table.set_border_width (border_width);
@@ -1190,26 +1231,26 @@ TimeAxisView::color_handler ()
 
        for (list<SelectionRect*>::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<SelectionRect*>::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"));
        }
 }
 
@@ -1283,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;
@@ -1361,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 {