From ea1669aa00d0d55219531f22b747b994440977fd Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 17 Jun 2017 17:13:06 +0200 Subject: Remove delayed selection which causes duplicate selection actifacts. The first click to select a new stripable may actually un-select strip. counting and ignoring this leads to strange behavior. Also when the selection_counter hit zero, VCAs were not ignored. whatever this workaround was good for, it's more trouble than it's worth. As side-effect this also improves DnD + Gtk::Entry behavior with stock GTK. --- gtk2_ardour/editor_routes.cc | 13 ------------- gtk2_ardour/editor_routes.h | 1 - 2 files changed, 14 deletions(-) diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index d21113b8b5..5db3b736be 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -87,7 +87,6 @@ EditorRoutes::EditorRoutes (Editor* e) , _queue_tv_update (0) , _menu (0) , old_focus (0) - , selection_countdown (0) , name_editable (0) { static const int column_width = 22; @@ -359,7 +358,6 @@ EditorRoutes::enter_notify (GdkEventCrossing*) /* arm counter so that ::selection_filter() will deny selecting anything for the * next two attempts to change selection status. */ - selection_countdown = 2; _scroller.grab_focus (); Keyboard::magic_widget_grab_focus (); return false; @@ -368,8 +366,6 @@ EditorRoutes::enter_notify (GdkEventCrossing*) bool EditorRoutes::leave_notify (GdkEventCrossing*) { - selection_countdown = 0; - if (old_focus) { old_focus->grab_focus (); old_focus = 0; @@ -1465,15 +1461,6 @@ EditorRoutes::selection_changed () bool EditorRoutes::selection_filter (Glib::RefPtr const& model, TreeModel::Path const& path, bool /*selected*/) { - if (selection_countdown) { - if (--selection_countdown == 0) { - return true; - } else { - /* no selection yet ... */ - return false; - } - } - TreeModel::iterator iter = model->get_iter (path); if (iter) { boost::shared_ptr stripable = (*iter)[_columns.stripable]; diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h index 320b9b9064..b1f925d009 100644 --- a/gtk2_ardour/editor_routes.h +++ b/gtk2_ardour/editor_routes.h @@ -171,7 +171,6 @@ private: Gtk::Menu* _menu; Gtk::Widget* old_focus; - uint32_t selection_countdown; Gtk::CellEditable* name_editable; bool key_press (GdkEventKey* ev); -- cgit v1.2.3