diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-02-05 19:57:56 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-02-05 19:57:56 +1100 |
| commit | f9b258745850143b37950a1defacc4937469d022 (patch) | |
| tree | f6dda92a0a69ce261c3a84b35ddcb64856789d90 /gtk2_ardour | |
| parent | 40c8c26b794e4d7372cfb8ea0b2d78fb7507f6fa (diff) | |
Make redo action insensitive after new command.
Don't erroneously send first_move more than once after autoscroll drag.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index a29c1ebeef..0cb58a8387 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3434,6 +3434,7 @@ Editor::commit_reversible_command () if (_session) { if (before.size() == 1) { _session->add_command (new MementoCommand<SelectionMemento>(*(_selection_memento), before.front(), &_selection_memento->get_state ())); + redo_action->set_sensitive(false); undo_action->set_sensitive(true); begin_selection_op_history (); } diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index cacfff699a..79f8654ff4 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -390,10 +390,11 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll) bool first_move = (_move_threshold_passed != old_move_threshold_passed) || from_autoscroll; - motion (event, first_move && !_starting_point_passed); - _starting_point_passed = first_move; + if (first_move && !_starting_point_passed) { + _starting_point_passed = true; + } _last_pointer_x = _drags->current_pointer_x (); _last_pointer_y = current_pointer_y (); |