diff options
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 2 | ||||
| -rwxr-xr-x | tools/fmt-bindings | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 72bf08e799..93509e8948 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1311,7 +1311,7 @@ AudioRegionView::entered (bool internal_editing) gain_line->add_visibility (AutomationLine::ControlPoints); } - if (!internal_editing) { + if (!internal_editing && ( trackview.editor().current_mouse_mode() == Editing::MouseObject ) ) { if (start_xfade_rect) { start_xfade_rect->set_outline (true); } diff --git a/tools/fmt-bindings b/tools/fmt-bindings index ab4595d965..913ff25e01 100755 --- a/tools/fmt-bindings +++ b/tools/fmt-bindings @@ -18,7 +18,7 @@ $group_number = 0; %merge_bindings; $platform = linux; -$winkey = 'Mod4\>\<Super'; +$winkey = 'Win'; $make_cheatsheet = 1; $make_accelmap = 0; $merge_from = ""; @@ -56,7 +56,7 @@ if ($platform eq "darwin") { $gtk_modifier_map{'PRIMARY'} = 'Control'; $gtk_modifier_map{'SECONDARY'} = 'Alt'; $gtk_modifier_map{'TERTIARY'} = 'Shift'; - $gtk_modifier_map{'LEVEL4'} = $winkey; + $gtk_modifier_map{'LEVEL4'} = 'window'; $gtk_modifier_map{'WINDOW'} = 'Alt'; $gtk_modifier_map{$winkey} => 'Win'; |