From c3151944356fc9cec8e95eb5a777faf662ab4fe3 Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Mon, 21 Apr 2008 17:39:11 -0500 Subject: [PATCH] Make control+right-click deletion work for regions again. --- Timeline/Region.C | 4 +++- Timeline/Sequence_Widget.C | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Timeline/Region.C b/Timeline/Region.C index 1b735e3..63fa266 100644 --- a/Timeline/Region.C +++ b/Timeline/Region.C @@ -352,7 +352,7 @@ Region::handle ( int m ) /* duplication */ return 1; } - else if ( Fl::event_button3() ) + else if ( Fl::event_button3() && ! Fl::event_ctrl() ) { /* context menu */ @@ -388,6 +388,8 @@ Region::handle ( int m ) _fade_out.type = (Fade::fade_type_e)(int)(r - &menu[8]); } + return 1; + } else return Sequence_Widget::handle( m ); diff --git a/Timeline/Sequence_Widget.C b/Timeline/Sequence_Widget.C index f5f785b..2588235 100644 --- a/Timeline/Sequence_Widget.C +++ b/Timeline/Sequence_Widget.C @@ -159,7 +159,7 @@ Sequence_Widget::handle ( int m ) { redraw(); _track->queue_delete( this ); - return 0; + return 1; } else if ( Fl::event_button1() )