diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-05-20 04:00:04 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2015-05-20 04:00:04 +1000 |
| commit | 66221d1dea2fc82f236ee7b3815b6b3598e0dc89 (patch) | |
| tree | acf8d697e18e2961ade406fbe70555a51a851a58 /gtk2_ardour/editor_drag.cc | |
| parent | 0d8a331bcaeb716962a821450b8d02c615c29400 (diff) | |
Add more modifier preferences.
Note that no defaults are set - go to prefs->user interaction to
ensure that nothing is set to "no modifer"
also - the copy modifier doesn't actually save its state yet.
Diffstat (limited to 'gtk2_ardour/editor_drag.cc')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 0e75c48cdb..ca45cbc755 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -2614,7 +2614,7 @@ TrimDrag::start_grab (GdkEvent* event, Gdk::Cursor*) framepos_t const pf = adjusted_current_frame (event); setup_snap_delta (region_start); - if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) { + if (Keyboard::modifier_state_equals (event->button.state, Keyboard::trim_contents_modifier ())) { /* Move the contents of the region around without changing the region bounds */ _operation = ContentsTrim; Drag::start_grab (event, _editor->cursors()->trimmer); @@ -2720,7 +2720,7 @@ TrimDrag::motion (GdkEvent* event, bool first_move) bool non_overlap_trim = false; - if (event && Keyboard::modifier_state_equals (event->button.state, Keyboard::ModifierMask (Keyboard::PrimaryModifier | Keyboard::TertiaryModifier))) { + if (event && Keyboard::modifier_state_equals (event->button.state, Keyboard::trim_overlap_modifier ())) { non_overlap_trim = true; } |