diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/screens.c | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/apps/screens.c b/apps/screens.c index 2e5f44c2ab..c4ae113676 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -572,10 +572,9 @@ bool f3_screen(void) | |||
572 | int w,h; | 572 | int w,h; |
573 | char* ptr; | 573 | char* ptr; |
574 | 574 | ||
575 | ptr = str(LANG_F3_STATUS); | ||
576 | lcd_getstringsize(ptr,&w,&h); | ||
577 | lcd_clear_display(); | 575 | lcd_clear_display(); |
578 | 576 | ||
577 | /* Scrollbar */ | ||
579 | lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_F3_SCROLL)); | 578 | lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_F3_SCROLL)); |
580 | lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F3_BAR)); | 579 | lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F3_BAR)); |
581 | lcd_putsxy(0, LCD_HEIGHT/2, | 580 | lcd_putsxy(0, LCD_HEIGHT/2, |
@@ -583,6 +582,9 @@ bool f3_screen(void) | |||
583 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], | 582 | lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], |
584 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); | 583 | LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); |
585 | 584 | ||
585 | /* Status bar */ | ||
586 | ptr = str(LANG_F3_STATUS); | ||
587 | lcd_getstringsize(ptr,&w,&h); | ||
586 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2, ptr); | 588 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2, ptr); |
587 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h, str(LANG_F3_BAR)); | 589 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h, str(LANG_F3_BAR)); |
588 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, | 590 | lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, |
@@ -590,11 +592,14 @@ bool f3_screen(void) | |||
590 | lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], | 592 | lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], |
591 | LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); | 593 | LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); |
592 | 594 | ||
593 | /* Invert */ | 595 | /* Flip */ |
594 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, str(LANG_INVERT)); | 596 | ptr = str(LANG_FLIP_DISPLAY); |
595 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, | 597 | lcd_getstringsize(ptr,&w,&h); |
596 | global_settings.invert ? | 598 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, str(LANG_FLIP_DISPLAY)); |
597 | str(LANG_INVERT_LCD_INVERSE) : str(LANG_INVERT_LCD_NORMAL)); | 599 | ptr = global_settings.flip_display ? |
600 | str(LANG_SET_BOOL_YES) : str(LANG_SET_BOOL_NO); | ||
601 | lcd_getstringsize(ptr,&w,&h); | ||
602 | lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); | ||
598 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], | 603 | lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], |
599 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); | 604 | LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); |
600 | 605 | ||
@@ -615,8 +620,12 @@ bool f3_screen(void) | |||
615 | 620 | ||
616 | case BUTTON_DOWN: | 621 | case BUTTON_DOWN: |
617 | case BUTTON_F3 | BUTTON_DOWN: | 622 | case BUTTON_F3 | BUTTON_DOWN: |
618 | global_settings.invert = !global_settings.invert; | 623 | case BUTTON_UP: /* allow "up" as well, more tolerant if tilted */ |
619 | lcd_set_invert_display(global_settings.invert); | 624 | case BUTTON_F3 | BUTTON_UP: |
625 | global_settings.flip_display = !global_settings.flip_display; | ||
626 | button_set_flip(global_settings.flip_display); | ||
627 | lcd_set_flip(global_settings.flip_display); | ||
628 | //lcd_update(); /* need to refresh */ | ||
620 | used = true; | 629 | used = true; |
621 | break; | 630 | break; |
622 | 631 | ||