devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Removed F3 handling in the set_() functions. Now the function callback is not called on button timeouts.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2332 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2002-09-19 09:00:25 +00:00
parent a316213f0f
commit c3eb83c695
1 changed files with 8 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

42
apps/settings.c
View file

@ -657,6 +657,7 @@ void set_int(char* string,
int max ) int max )
{ {
bool done = false; bool done = false;
int button;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
if(global_settings.statusbar) if(global_settings.statusbar)
@ -677,7 +678,8 @@ void set_int(char* string,
#endif #endif
lcd_update(); lcd_update();
switch( button_get_w_tmo(HZ/2) ) { button = button_get_w_tmo(HZ/2);
switch(button) {
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
case BUTTON_UP: case BUTTON_UP:
case BUTTON_UP | BUTTON_REPEAT: case BUTTON_UP | BUTTON_REPEAT:
@ -710,23 +712,8 @@ void set_int(char* string,
#endif #endif
done = true; done = true;
break; break;
#ifdef HAVE_RECORDER_KEYPAD
case BUTTON_F3:
#ifdef HAVE_LCD_BITMAP
global_settings.statusbar = !global_settings.statusbar;
settings_save();
if(global_settings.statusbar)
lcd_setmargins(0, STATUSBAR_HEIGHT);
else
lcd_setmargins(0, 0);
lcd_clear_display();
lcd_puts_scroll(0, 0, string);
#endif
break;
#endif
} }
if ( function ) if ( function && button != BUTTON_NONE)
function(*variable); function(*variable);
} }
lcd_stop_scroll(); lcd_stop_scroll();
@ -736,6 +723,7 @@ void set_option(char* string, int* variable, char* options[],
int numoptions, void (*function)(int)) int numoptions, void (*function)(int))
{ {
bool done = false; bool done = false;
int button;
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
if(global_settings.statusbar) if(global_settings.statusbar)
@ -753,7 +741,8 @@ void set_option(char* string, int* variable, char* options[],
#endif #endif
lcd_update(); lcd_update();
switch ( button_get_w_tmo(HZ/2) ) { button = button_get_w_tmo(HZ/2);
switch (button) {
#ifdef HAVE_RECORDER_KEYPAD #ifdef HAVE_RECORDER_KEYPAD
case BUTTON_UP: case BUTTON_UP:
case BUTTON_UP | BUTTON_REPEAT: case BUTTON_UP | BUTTON_REPEAT:
@ -788,24 +777,9 @@ void set_option(char* string, int* variable, char* options[],
#endif #endif
done = true; done = true;
break; break;
#ifdef HAVE_RECORDER_KEYPAD
case BUTTON_F3:
#ifdef HAVE_LCD_BITMAP
global_settings.statusbar = !global_settings.statusbar;
settings_save();
if(global_settings.statusbar)
lcd_setmargins(0, STATUSBAR_HEIGHT);
else
lcd_setmargins(0, 0);
lcd_clear_display();
lcd_puts_scroll(0, 0, string);
#endif
break;
#endif
} }
if ( function ) if ( function && button != BUTTON_NONE)
function(*variable); function(*variable);
} }
lcd_stop_scroll(); lcd_stop_scroll();