mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clean up some event handlig breakage from sequence region split.

This commit is contained in:
Jonathan Moore Liles 2008-05-06 22:00:32 -05:00
parent 9aa52f3e18
commit 9ed5394e5d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Timeline/Audio_Region.C
View File

@ -292,7 +292,7 @@ Audio_Region::handle ( int m )
/* duplication */ /* duplication */
return 1; return 1;
} }
else if ( Fl::event_button3() && ! Fl::event_ctrl() ) else if ( Fl::test_shortcut( FL_BUTTON3 ) && ! Fl::event_shift() )
{ {
/* context menu */ /* context menu */
@ -330,7 +330,7 @@ Audio_Region::handle ( int m )
redraw(); redraw();
} }
return 1; return 0;
} }
else else
return Sequence_Widget::handle( m ); return Sequence_Widget::handle( m );

8
Timeline/Sequence_Region.C
View File

@ -91,12 +91,9 @@ Sequence_Region::trim ( enum trim_e t, int X )
int int
Sequence_Region::handle ( int m ) Sequence_Region::handle ( int m )
{ {
static int ox, oy;
static enum trim_e trimming; static enum trim_e trimming;
static bool copied = false; static bool copied = false;
static nframes_t os;
/* if ( ! active_r() ) */ /* if ( ! active_r() ) */
/* return 0; */ /* return 0; */
@ -137,7 +134,7 @@ Sequence_Region::handle ( int m )
fl_cursor( FL_CURSOR_WE ); fl_cursor( FL_CURSOR_WE );
return 1; return 1;
} }
else if ( Fl::test_shortcut( FL_BUTTON3 ) ) else if ( Fl::test_shortcut( FL_BUTTON2 ) && ! Fl::event_shift() )
{ {
if ( Sequence_Widget::current() == this ) if ( Sequence_Widget::current() == this )
{ {
@ -212,4 +209,7 @@ Sequence_Region::handle ( int m )
return Sequence_Widget::handle( m ); return Sequence_Widget::handle( m );
break; break;
} }
return 0;
} }