len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

some changes to use of display_text.

Browse source 
* add parameter, wait_key to display_text().
 - set this true to wait button press after all words is displayed.
* use ARRAYLEN macro instead of #define WORDS
* add macro to indicate end of style array.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24846 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-02-22 07:17:15 +00:00
parent 04067fd7a0
commit 56d29e8977
13 changed files with 91 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

25
apps/plugins/solitaire.c
View file

@ -686,8 +686,6 @@ static void draw_empty_stack( int s, int x, int y, bool cursor )
/* Help */
static bool solitaire_help( void )
{
#define WORDS (sizeof help_text / sizeof (char*))
static char* help_text[] = {
"Solitaire", "", "Controls", "",
HK_LR ":", "Move", "the", "cursor", "to", "the",
@ -711,29 +709,10 @@ static bool solitaire_help( void )
{ 0, TEXT_CENTER|TEXT_UNDERLINE },
{ 2, C_RED },
{ 48, C_RED },
{ -1, 0 }
LAST_STYLE_ITEM
};
#if LCD_DEPTH > 1
fb_data* backdrop = rb->lcd_get_backdrop();
rb->lcd_set_backdrop(NULL);
#endif
#ifdef HAVE_LCD_COLOR
rb->lcd_set_background(LCD_BLACK);
rb->lcd_set_foreground(LCD_WHITE);
#endif
int button;
if (display_text(WORDS, help_text, formation, NULL))
if (display_text(ARRAYLEN(help_text), help_text, formation, NULL, true))
return true;
do {
button = rb->button_get(true);
if ( rb->default_event_handler( button ) == SYS_USB_CONNECTED )
return true;
} while( ( button == BUTTON_NONE )
|| ( button & (BUTTON_REL|BUTTON_REPEAT) ) );
#if LCD_DEPTH > 1
rb->lcd_set_backdrop(backdrop);
#endif
return false;
}