ardour/livetrax
13
0
Fork 0
Code

xfade rects should only pop-up in Object mode, when they are focusable

Browse Source
This commit is contained in:
Ben Loftis 2014-07-07 15:34:20 -05:00
parent 116a0ad327
commit eaa17c3951
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/audio_region_view.cc
View File

@ -1311,7 +1311,7 @@ AudioRegionView::entered (bool internal_editing)
gain_line->add_visibility (AutomationLine::ControlPoints); gain_line->add_visibility (AutomationLine::ControlPoints);
} }
if (!internal_editing) { if (!internal_editing && ( trackview.editor().current_mouse_mode() == Editing::MouseObject ) ) {
if (start_xfade_rect) { if (start_xfade_rect) {
start_xfade_rect->set_outline (true); start_xfade_rect->set_outline (true);
} }

4
tools/fmt-bindings
View File

@ -18,7 +18,7 @@ $group_number = 0;
%merge_bindings; %merge_bindings;
$platform = linux; $platform = linux;
$winkey = 'Mod4\>\<Super'; $winkey = 'Win';
$make_cheatsheet = 1; $make_cheatsheet = 1;
$make_accelmap = 0; $make_accelmap = 0;
$merge_from = ""; $merge_from = "";
@ -56,7 +56,7 @@ if ($platform eq "darwin") {
$gtk_modifier_map{'PRIMARY'} = 'Control'; $gtk_modifier_map{'PRIMARY'} = 'Control';
$gtk_modifier_map{'SECONDARY'} = 'Alt'; $gtk_modifier_map{'SECONDARY'} = 'Alt';
$gtk_modifier_map{'TERTIARY'} = 'Shift'; $gtk_modifier_map{'TERTIARY'} = 'Shift';
$gtk_modifier_map{'LEVEL4'} = $winkey; $gtk_modifier_map{'LEVEL4'} = 'window';
$gtk_modifier_map{'WINDOW'} = 'Alt'; $gtk_modifier_map{'WINDOW'} = 'Alt';
$gtk_modifier_map{$winkey} => 'Win'; $gtk_modifier_map{$winkey} => 'Win';