Mixer sidebar: show group context menu on right-click only

[ardour.git] / gtk2_ardour / mixer_ui.cc

diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index 5192a90abc99ba98a1721063fdd6f2a90bbbf126..e3f8111ca6e3fe149d8f0d61bbfcf23cce735d88 100644 (file)
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -390,13 +390,16 @@ Mixer_UI::use_own_window (bool and_fill_it)
 
        Gtk::Window* win = Tabbable::use_own_window (and_fill_it);
 
-
        if (win && new_window) {
                win->set_name ("MixerWindow");
                ARDOUR_UI::instance()->setup_toplevel_window (*win, _("Mixer"), this);
                win->signal_event().connect (sigc::bind (sigc::ptr_fun (&Keyboard::catch_user_event_for_pre_dialog_focus), win));
                win->set_data ("ardour-bindings", bindings);
                update_title ();
+               if (!win->get_focus()) {
+                       /* set focus widget to something, anything */
+                       win->set_focus (scroller);
+               }
        }
 
        return win;
@@ -765,13 +768,20 @@ Mixer_UI::sync_presentation_info_from_treeview ()
                SortByNewDisplayOrder cmp;
                sort (sorted.begin(), sorted.end(), cmp);
                for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) {
+                       if (_session->master_out() && (_session->master_out()->presentation_info().order() == n)) {
+                               ++n;
+                       }
                        if (sr->old_display_order != n) {
                                change = true;
+                               break;
                        }
                }
                if (change) {
                        n = 0;
                        for (OrderingKeys::iterator sr = sorted.begin(); sr != sorted.end(); ++sr, ++n) {
+                               if (_session->master_out() && (_session->master_out()->presentation_info().order() == n)) {
+                                       ++n;
+                               }
                                if (sr->stripable->presentation_info().order() != n) {
                                        sr->stripable->set_presentation_order (n);
                                }
@@ -849,6 +859,10 @@ Mixer_UI::sync_treeview_from_presentation_info (PropertyChange const & what_chan
                                _selection.remove (*i);
                        }
                }
+
+               if (!_selection.axes.empty() && !PublicEditor::instance().track_selection_change_without_scroll ()) {
+                       move_stripable_into_view ((*_selection.axes.begin())->stripable());
+               }
        }
 
        redisplay_track_list ();
@@ -914,8 +928,6 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
                                bool accumulate = false;
                                bool found_another = false;
 
-                               tmp.push_back (strip);
-
                                OrderingKeys sorted;
                                const size_t cmp_max = strips.size ();
                                for (list<MixerStrip*>::iterator i = strips.begin(); i != strips.end(); ++i) {
@@ -956,12 +968,16 @@ Mixer_UI::strip_button_release_event (GdkEventButton *ev, MixerStrip *strip)
                                        }
                                }
 
+                               tmp.push_back (strip);
+
                                if (found_another) {
+                                       PresentationInfo::ChangeSuspender cs;
                                        for (vector<MixerStrip*>::iterator i = tmp.begin(); i != tmp.end(); ++i) {
                                                _selection.add (*i);
                                        }
-                               } else
+                               } else {
                                        _selection.set (strip);  //user wants to start a range selection, but there aren't any others selected yet
+                               }
                        } else {
                                _selection.set (strip);
                        }
@@ -1329,6 +1345,7 @@ Mixer_UI::spill_redisplay (boost::shared_ptr<VCA> vca)
 
                AxisView* av = (*i)[stripable_columns.strip];
                MixerStrip* strip = dynamic_cast<MixerStrip*> (av);
+               bool const visible = (*i)[stripable_columns.visible];
 
                if (!strip) {
                        /* we're in the middle of changing a row, don't worry */
@@ -1352,7 +1369,7 @@ Mixer_UI::spill_redisplay (boost::shared_ptr<VCA> vca)
                        }
                }
 
-               if (slaved) {
+               if (slaved && visible) {
 
                        if (strip->packed()) {
                                strip_packer.reorder_child (*strip, -1); /* put at end */
@@ -1581,11 +1598,13 @@ Mixer_UI::move_stripable_into_view (boost::shared_ptr<ARDOUR::Stripable> s)
 #endif
        bool found = false;
        int x0 = 0;
+       Gtk::Allocation alloc;
        for (list<MixerStrip *>::const_iterator i = strips.begin(); i != strips.end(); ++i) {
                if ((*i)->route() == s) {
                        int y;
                        found = true;
                        (*i)->translate_coordinates (strip_packer, 0, 0, x0, y);
+                       alloc = (*i)->get_allocation ();
                        break;
                }
        }
@@ -1594,7 +1613,13 @@ Mixer_UI::move_stripable_into_view (boost::shared_ptr<ARDOUR::Stripable> s)
        }
 
        Adjustment* adj = scroller.get_hscrollbar()->get_adjustment();
-       scroller.get_hscrollbar()->set_value (max (adj->get_lower(), min (adj->get_upper(), x0 - 1.0)));
+
+       if (x0 < adj->get_value()) {
+               adj->set_value (max (adj->get_lower(), min (adj->get_upper(), (double) x0)));
+       } else if (x0 + alloc.get_width() >= adj->get_value() + adj->get_page_size()) {
+               int x1 = x0 + alloc.get_width() - adj->get_page_size();
+               adj->set_value (max (adj->get_lower(), min (adj->get_upper(), (double) x1)));
+       }
 }
 
 void
@@ -1664,13 +1689,17 @@ Mixer_UI::group_display_button_press (GdkEventButton* ev)
        int celly;
 
        if (!group_display.get_path_at_pos ((int)ev->x, (int)ev->y, path, column, cellx, celly)) {
-               _group_tabs->get_menu(0)->popup (1, ev->time);
+               if (ev->button == 3) {
+                       _group_tabs->get_menu(0)->popup (ev->button, ev->time);
+               }
                return true;
        }
 
        TreeIter iter = group_model->get_iter (path);
        if (!iter) {
-               _group_tabs->get_menu(0)->popup (1, ev->time);
+               if (ev->button == 3) {
+                       _group_tabs->get_menu(0)->popup (ev->button, ev->time);
+               }
                return true;
        }
 
@@ -3075,26 +3104,22 @@ void
 Mixer_UI::vca_assign (boost::shared_ptr<VCA> vca)
 {
        set_axis_targets_for_operation ();
-#if 0
        BOOST_FOREACH(AxisView* r, _axis_targets) {
                MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
                if (ms) {
                        ms->vca_assign (vca);
                }
        }
-#endif
 }
 
 void
 Mixer_UI::vca_unassign (boost::shared_ptr<VCA> vca)
 {
        set_axis_targets_for_operation ();
-#if 0
        BOOST_FOREACH(AxisView* r, _axis_targets) {
                MixerStrip* ms = dynamic_cast<MixerStrip*> (r);
                if (ms) {
                        ms->vca_unassign (vca);
                }
        }
-#endif
 }