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

Mixer: Clean up connection DND behavior.

This commit is contained in:
Jonathan Moore Liles 2013-05-22 20:11:41 -07:00
parent 70e23f1994
commit 960dc543c3
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mixer/src/JACK_Module.C
View File

@ -509,17 +509,16 @@ JACK_Module::handle_chain_name_changed ( void )
int int
JACK_Module::handle ( int m ) JACK_Module::handle ( int m )
{ {
static JACK_Module *drag_source = 0;
switch ( m ) switch ( m )
{ {
case FL_PUSH: case FL_PUSH:
return Module::handle(m) || 1; return Module::handle(m) || 1;
case FL_RELEASE: case FL_RELEASE:
receptive_to_drop = NULL;
return Module::handle(m) || 1; return Module::handle(m) || 1;
case FL_DRAG: case FL_DRAG:
{ {
if ( ! Fl::event_inside( this ) && this != drag_source ) if ( ! Fl::event_inside( this ) )
{ {
DMESSAGE( "initiation of drag" ); DMESSAGE( "initiation of drag" );
@ -542,8 +541,6 @@ JACK_Module::handle ( int m )
free( s ); free( s );
Fl::dnd(); Fl::dnd();
drag_source = this;
return 1; return 1;
} }
@ -570,9 +567,6 @@ JACK_Module::handle ( int m )
return 1; return 1;
case FL_DND_DRAG: case FL_DND_DRAG:
{ {
if ( this == drag_source )
return 0;
if ( this == receptive_to_drop ) if ( this == receptive_to_drop )
return 1; return 1;
@ -591,7 +585,8 @@ JACK_Module::handle ( int m )
receptive_to_drop = NULL; receptive_to_drop = NULL;
redraw(); redraw();
drag_source = NULL; if ( ! Fl::event_inside( this ) )
return 0;
/* NOW we get the text... */ /* NOW we get the text... */
const char *text = Fl::event_text(); const char *text = Fl::event_text();