diff options
author | Robin Gareus <robin@gareus.org> | 2019-08-13 00:49:45 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-08-13 00:52:21 +0200 |
commit | 8a9b38e5408954362716facd92a90f0cd3fbfb29 (patch) | |
tree | 88be8782ec7364ff2138f231e2fa1a49683ac08a | |
parent | f8e3a1cdcda872b71d9f9946163d9d720fd6afda (diff) |
Remove remnants of hack from 9f3f3738e7444ee3
This fixes multiple selection. The original code using
"selection_countdown" is no longer in place. There's no "counter" to arm.
Shift/Tab name edit works regardless.
"s/m/r" solo/mute/rec shortcuts in the treeview have been discontinued
since a long time as well. Keyboard shortcuts are per window, regardless
of grab_focus()
PS. This change makes it easier for a user to start a drag/drop
operation of multiple regions. That currently assert()s, only
the first selected region is used.
-rw-r--r-- | gtk2_ardour/editor_regions.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_routes.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/editor_sources.cc | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 3574c14453..d204330948 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -336,10 +336,6 @@ EditorRegions::enter_notify (GdkEventCrossing*) return true; } - /* arm counter so that ::selection_filter() will deny selecting anything for the - next two attempts to change selection status. - */ - _scroller.grab_focus (); Keyboard::magic_widget_grab_focus (); return false; } diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index 85cb372072..a763d90021 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -366,10 +366,6 @@ EditorRoutes::enter_notify (GdkEventCrossing*) return true; } - /* arm counter so that ::selection_filter() will deny selecting anything for the - * next two attempts to change selection status. - */ - _scroller.grab_focus (); Keyboard::magic_widget_grab_focus (); return false; } diff --git a/gtk2_ardour/editor_sources.cc b/gtk2_ardour/editor_sources.cc index 2021ec52ce..ee8e84458e 100644 --- a/gtk2_ardour/editor_sources.cc +++ b/gtk2_ardour/editor_sources.cc @@ -260,10 +260,6 @@ EditorSources::enter_notify (GdkEventCrossing*) return true; } - /* arm counter so that ::selection_filter() will deny selecting anything for the - next two attempts to change selection status. - */ - _scroller.grab_focus (); Keyboard::magic_widget_grab_focus (); return false; } |