smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Remove delayed selection which causes duplicate selection actifacts.

Browse source 
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.
This commit is contained in:
Robin Gareus 2017-06-17 17:13:06 +02:00
parent cfe63b7b15
commit ea1669aa00
2 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
gtk2_ardour/editor_routes.cc
View file

@ -87,7 +87,6 @@ EditorRoutes::EditorRoutes (Editor* e)
, _queue_tv_update (0) , _queue_tv_update (0)
, _menu (0) , _menu (0)
, old_focus (0) , old_focus (0)
, selection_countdown (0)
, name_editable (0) , name_editable (0)
{ {
static const int column_width = 22; 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 /* arm counter so that ::selection_filter() will deny selecting anything for the
* next two attempts to change selection status. * next two attempts to change selection status.
*/ */
selection_countdown = 2;
_scroller.grab_focus (); _scroller.grab_focus ();
Keyboard::magic_widget_grab_focus (); Keyboard::magic_widget_grab_focus ();
return false; return false;
@ -368,8 +366,6 @@ EditorRoutes::enter_notify (GdkEventCrossing*)
bool bool
EditorRoutes::leave_notify (GdkEventCrossing*) EditorRoutes::leave_notify (GdkEventCrossing*)
{ {
selection_countdown = 0;
if (old_focus) { if (old_focus) {
old_focus->grab_focus (); old_focus->grab_focus ();
old_focus = 0; old_focus = 0;
@ -1465,15 +1461,6 @@ EditorRoutes::selection_changed ()
bool bool
EditorRoutes::selection_filter (Glib::RefPtr<TreeModel> const& model, TreeModel::Path const& path, bool /*selected*/) EditorRoutes::selection_filter (Glib::RefPtr<TreeModel> 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); TreeModel::iterator iter = model->get_iter (path);
if (iter) { if (iter) {
boost::shared_ptr<Stripable> stripable = (*iter)[_columns.stripable]; boost::shared_ptr<Stripable> stripable = (*iter)[_columns.stripable];

1
gtk2_ardour/editor_routes.h
View file

@ -171,7 +171,6 @@ private:
Gtk::Menu* _menu; Gtk::Menu* _menu;
Gtk::Widget* old_focus; Gtk::Widget* old_focus;
uint32_t selection_countdown;
Gtk::CellEditable* name_editable; Gtk::CellEditable* name_editable;
bool key_press (GdkEventKey* ev); bool key_press (GdkEventKey* ev);