Browse Source

Timeline: Fix bug where opening context menu on a region is equivalent to initiating a drag on that region.

Closes #126
tags/non-daw-v1.2.0
Jonathan Moore Liles 9 years ago
parent
commit
9790201fd8
3 changed files with 24 additions and 14 deletions
  1. +3
    -0
      timeline/src/Audio_Region.C
  2. +20
    -13
      timeline/src/Sequence.C
  3. +1
    -1
      timeline/src/Track.C

+ 3
- 0
timeline/src/Audio_Region.C View File

@@ -841,6 +841,9 @@ Audio_Region::handle ( int m )
}
case FL_DRAG:

if ( Fl::event_is_click() )
return 1;

if ( ! _drag )
{
begin_drag( Drag( X, Y, x_to_offset( X ) ) );


+ 20
- 13
timeline/src/Sequence.C View File

@@ -321,6 +321,10 @@ Sequence::handle ( int m )
/* if ( m != FL_NO_EVENT ) */
/* DMESSAGE( "%s", event_name( m ) ); */

// if ( m == FL_RELEASE )
if ( ! Fl::pushed() )
Sequence_Widget::pushed( NULL );

switch ( m )
{
case FL_KEYBOARD:
@@ -398,14 +402,16 @@ Sequence::handle ( int m )
if ( Sequence_Widget::pushed()->sequence()->class_name() == class_name() )
{
/* accept objects dragged from other sequences of this type */
timeline->sequence_lock.wrlock();
add( Sequence_Widget::pushed() );
timeline->sequence_lock.unlock();
damage( FL_DAMAGE_USER1 );
fl_cursor( FL_CURSOR_MOVE );
if ( Sequence_Widget::pushed()->sequence() != this )
{
timeline->sequence_lock.wrlock();
add( Sequence_Widget::pushed() );
timeline->sequence_lock.unlock();
damage( FL_DAMAGE_USER1 );
fl_cursor( FL_CURSOR_MOVE );
}
}
else
fl_cursor( FL_CURSOR_DEFAULT );
@@ -446,9 +452,9 @@ Sequence::handle ( int m )
if ( r )
r->handle( FL_ENTER );
}
return 1;
}

return 1;
}
default:
{
@@ -462,6 +468,9 @@ Sequence::handle ( int m )
/* if ( this == Fl::focus() ) */
/* DMESSAGE( "Sequence widget = %p", r ); */

if ( m == FL_RELEASE )
Sequence_Widget::pushed( NULL );

if ( r )
{
int retval = r->dispatch( m );
@@ -482,8 +491,6 @@ Sequence::handle ( int m )

r->handle( FL_FOCUS );
}
else if ( m == FL_RELEASE )
Sequence_Widget::pushed( NULL );
}

if ( _delete_queue.size() )
@@ -508,7 +515,7 @@ Sequence::handle ( int m )
timeline->sequence_lock.unlock();
}

Loggable::block_end();
Loggable::block_end();
}

if ( m == FL_PUSH )


+ 1
- 1
timeline/src/Track.C View File

@@ -1137,7 +1137,7 @@ Track::handle ( int m )
timeline->insert_track( this, timeline->event_inside() );
return 1;
}
return 0;
return Fl_Group::handle( m );
break;
case FL_DND_RELEASE:
receptive_to_drop = 0;


Loading…
Cancel
Save