diff --git a/Timeline/Audio_Region.C b/Timeline/Audio_Region.C index ed188cf..9b9ad6b 100644 --- a/Timeline/Audio_Region.C +++ b/Timeline/Audio_Region.C @@ -292,7 +292,7 @@ Audio_Region::handle ( int m ) /* duplication */ return 1; } - else if ( Fl::event_button3() && ! Fl::event_ctrl() ) + else if ( Fl::test_shortcut( FL_BUTTON3 ) && ! Fl::event_shift() ) { /* context menu */ @@ -330,7 +330,7 @@ Audio_Region::handle ( int m ) redraw(); } - return 1; + return 0; } else return Sequence_Widget::handle( m ); diff --git a/Timeline/Sequence_Region.C b/Timeline/Sequence_Region.C index 281cac7..108b60f 100644 --- a/Timeline/Sequence_Region.C +++ b/Timeline/Sequence_Region.C @@ -91,12 +91,9 @@ Sequence_Region::trim ( enum trim_e t, int X ) int Sequence_Region::handle ( int m ) { - static int ox, oy; static enum trim_e trimming; static bool copied = false; - static nframes_t os; - /* if ( ! active_r() ) */ /* return 0; */ @@ -137,7 +134,7 @@ Sequence_Region::handle ( int m ) fl_cursor( FL_CURSOR_WE ); return 1; } - else if ( Fl::test_shortcut( FL_BUTTON3 ) ) + else if ( Fl::test_shortcut( FL_BUTTON2 ) && ! Fl::event_shift() ) { if ( Sequence_Widget::current() == this ) { @@ -212,4 +209,7 @@ Sequence_Region::handle ( int m ) return Sequence_Widget::handle( m ); break; } + + return 0; + }