diff options
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/solitaire.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 1e1b2dd780..09c8b90eb0 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -253,8 +253,10 @@ static char helptext[] = | |||
253 | /* background color */ | 253 | /* background color */ |
254 | #ifdef HAVE_LCD_COLOR | 254 | #ifdef HAVE_LCD_COLOR |
255 | # define BACKGROUND_COLOR LCD_RGBPACK(0,157,0) | 255 | # define BACKGROUND_COLOR LCD_RGBPACK(0,157,0) |
256 | # define FRAME_COLOR LCD_RGBPACK(23,119,218) | ||
256 | #elif LCD_DEPTH > 1 | 257 | #elif LCD_DEPTH > 1 |
257 | # define BACKGROUND_COLOR LCD_WHITE | 258 | # define BACKGROUND_COLOR LCD_WHITE |
259 | # define FRAME_COLOR LCD_BLACK | ||
258 | #endif | 260 | #endif |
259 | 261 | ||
260 | 262 | ||
@@ -312,10 +314,6 @@ static void draw_cursor( int x, int y ) | |||
312 | * if the cursor is currently over the card */ | 314 | * if the cursor is currently over the card */ |
313 | static void draw_card_ext( int x, int y, bool selected, bool cursor ) | 315 | static void draw_card_ext( int x, int y, bool selected, bool cursor ) |
314 | { | 316 | { |
315 | #if LCD_DEPTH > 1 | ||
316 | rb->lcd_set_foreground( LCD_BLACK ); | ||
317 | #endif | ||
318 | |||
319 | #ifdef LARGE_CARD | 317 | #ifdef LARGE_CARD |
320 | rb->lcd_hline( x+2, x+CARD_WIDTH-3, y ); | 318 | rb->lcd_hline( x+2, x+CARD_WIDTH-3, y ); |
321 | rb->lcd_hline( x+2, x+CARD_WIDTH-3, y+CARD_HEIGHT-1 ); | 319 | rb->lcd_hline( x+2, x+CARD_WIDTH-3, y+CARD_HEIGHT-1 ); |
@@ -334,11 +332,18 @@ static void draw_card_ext( int x, int y, bool selected, bool cursor ) | |||
334 | 332 | ||
335 | if( selected ) | 333 | if( selected ) |
336 | { | 334 | { |
335 | #if LCD_DEPTH > 1 | ||
336 | rb->lcd_set_foreground( FRAME_COLOR ); | ||
337 | #endif | ||
337 | rb->lcd_drawrect( x+1, y+1, CARD_WIDTH-2, CARD_HEIGHT-2 ); | 338 | rb->lcd_drawrect( x+1, y+1, CARD_WIDTH-2, CARD_HEIGHT-2 ); |
338 | #ifdef LARGE_CARD | 339 | #ifdef LARGE_CARD |
339 | rb->lcd_drawrect( x+2, y+2, CARD_WIDTH-4, CARD_HEIGHT-4 ); | 340 | rb->lcd_drawrect( x+2, y+2, CARD_WIDTH-4, CARD_HEIGHT-4 ); |
340 | #endif | 341 | #endif |
341 | } | 342 | } |
343 | #if LCD_DEPTH > 1 | ||
344 | rb->lcd_set_foreground( LCD_BLACK ); | ||
345 | #endif | ||
346 | |||
342 | if( cursor ) | 347 | if( cursor ) |
343 | { | 348 | { |
344 | draw_cursor( x, y ); | 349 | draw_cursor( x, y ); |
@@ -529,7 +534,6 @@ int solitaire_menu(bool in_game) | |||
529 | 534 | ||
530 | #if LCD_DEPTH > 1 | 535 | #if LCD_DEPTH > 1 |
531 | rb->lcd_set_foreground(LCD_DEFAULT_FG); | 536 | rb->lcd_set_foreground(LCD_DEFAULT_FG); |
532 | rb->lcd_set_background(LCD_DEFAULT_BG); | ||
533 | #endif | 537 | #endif |
534 | 538 | ||
535 | if (in_game) | 539 | if (in_game) |
@@ -1036,8 +1040,8 @@ int solitaire( void ) | |||
1036 | rb->lcd_clear_display(); | 1040 | rb->lcd_clear_display(); |
1037 | 1041 | ||
1038 | #if LCD_DEPTH > 1 | 1042 | #if LCD_DEPTH > 1 |
1043 | rb->lcd_set_background(LCD_DEFAULT_BG); | ||
1039 | rb->lcd_set_foreground(LCD_BLACK); | 1044 | rb->lcd_set_foreground(LCD_BLACK); |
1040 | rb->lcd_set_background(LCD_WHITE); | ||
1041 | #endif | 1045 | #endif |
1042 | 1046 | ||
1043 | /* get the biggest column length so that display can be "optimized" */ | 1047 | /* get the biggest column length so that display can be "optimized" */ |