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

Mixer: Clean up event handling.

This commit is contained in:
Jonathan Moore Liles 2010-01-30 02:38:15 -06:00
parent 3aca0212c4
commit 453d7bcd4e
5 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mixer/Meter.H
View File

@ -43,7 +43,7 @@ protected:
return 1; return 1;
} }
return Fl_Widget::handle( m ); return Fl_Valuator::handle( m );
} }
float float

9
Mixer/Mixer.C
View File

@ -495,18 +495,15 @@ Mixer::save_options ( void )
int int
Mixer::handle ( int m ) Mixer::handle ( int m )
{ {
int r = Fl_Group::handle( m ); if ( Fl_Group::handle( m ) )
return 1;
switch ( m ) switch ( m )
{ {
case FL_ENTER: case FL_ENTER:
case FL_LEAVE: case FL_LEAVE:
return 1; return 1;
default:
return r;
break;
} }
// return 0; return 0;
return r;
} }

2
Mixer/Mixer.H
View File

@ -58,7 +58,7 @@ private:
protected: protected:
virtual int handle ( int m ); int handle ( int m );
public: public:

20
Mixer/Mixer_Strip.C
View File

@ -546,16 +546,19 @@ Mixer_Strip::handle ( int m )
switch ( m ) switch ( m )
{ {
case FL_KEYBOARD: case FL_KEYBOARD:
{
if ( Fl_Group::handle( m ) ) if ( Fl_Group::handle( m ) )
return 1; return 1;
if ( test_press( FL_Menu ) ) if ( Fl::event_key() == FL_Menu )
{ {
menu_popup( &menu(), x(), y() ); menu_popup( &menu(), x(), y() );
return 1; return 1;
} }
else else
return menu().test_shortcut() != 0; return menu().test_shortcut() != 0;
}
break;
case FL_PUSH: case FL_PUSH:
{ {
if ( Fl_Group::handle( m ) ) if ( Fl_Group::handle( m ) )
@ -576,19 +579,6 @@ Mixer_Strip::handle ( int m )
_focused = false; _focused = false;
damage( FL_DAMAGE_USER1 ); damage( FL_DAMAGE_USER1 );
return 1; return 1;
/* case FL_ENTER: */
/* name_field->color( FL_BLACK ); */
/* name_field->redraw(); */
/* return 1; */
/* break; */
/* case FL_LEAVE: */
/* name_field->color( _color ); */
/* name_field->redraw(); */
/* return 1; */
/* break; */
default:
return Fl_Group::handle( m );
} }
return Fl_Group::handle( m ); return Fl_Group::handle( m );

2
Mixer/Module.C
View File

@ -462,7 +462,7 @@ Module::handle ( int m )
if ( Fl_Group::handle( m ) ) if ( Fl_Group::handle( m ) )
return 1; return 1;
if ( test_press( FL_Menu ) ) if ( Fl::event_key() == FL_Menu )
{ {
menu_popup( &menu(), x(), y() ); menu_popup( &menu(), x(), y() );
return 1; return 1;