mirror of
https://github.com/Ardour/ardour.git
synced 2026-01-18 11:26:00 +01:00
carl's fix to select objects when clicking in mouseGain mode, so that right click operations don't act on unexpected objects
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4252 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
895419625b
commit
df2fe18399
1 changed files with 7 additions and 5 deletions
|
|
@ -395,10 +395,11 @@ Editor::step_mouse_mode (bool next)
|
|||
void
|
||||
Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
|
||||
{
|
||||
/* in object/audition/timefx mode, any button press sets
|
||||
the selection if the object can be selected. this is a
|
||||
bit of hack, because we want to avoid this if the
|
||||
mouse operation is a region alignment.
|
||||
/* in object/audition/timefx/gain-automation mode,
|
||||
any button press sets the selection if the object
|
||||
can be selected. this is a bit of hack, because
|
||||
we want to avoid this if the mouse operation is a
|
||||
region alignment.
|
||||
|
||||
note: not dbl-click or triple-click
|
||||
*/
|
||||
|
|
@ -406,6 +407,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
|
|||
if (((mouse_mode != MouseObject) &&
|
||||
(mouse_mode != MouseAudition || item_type != RegionItem) &&
|
||||
(mouse_mode != MouseTimeFX || item_type != RegionItem) &&
|
||||
(mouse_mode != MouseGain) &&
|
||||
(mouse_mode != MouseRange)) ||
|
||||
|
||||
((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3)) {
|
||||
|
|
@ -424,7 +426,7 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Selection::Operation op = Keyboard::selection_type (event->button.state);
|
||||
bool press = (event->type == GDK_BUTTON_PRESS);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue