summaryrefslogtreecommitdiff
path: root/apps/tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/tree.c')
-rw-r--r--apps/tree.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/apps/tree.c b/apps/tree.c
index ce27f7b235..3aba7fa3b4 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -193,7 +193,8 @@ static int showdir(char *path, int start)
193#ifdef HAVE_LCD_BITMAP 193#ifdef HAVE_LCD_BITMAP
194 int line_height = LINE_HEIGTH; 194 int line_height = LINE_HEIGTH;
195 int fw, fh; 195 int fw, fh;
196 lcd_getfontsize(FONT_UI, &fw, &fh); 196 lcd_setfont(FONT_UI);
197 lcd_getstringsize("A", &fw, &fh);
197 tree_max_on_screen = (LCD_HEIGHT - MARGIN_Y) / fh; 198 tree_max_on_screen = (LCD_HEIGHT - MARGIN_Y) / fh;
198 line_height = fh; 199 line_height = fh;
199#else 200#else
@@ -591,7 +592,7 @@ bool dirbrowse(char *root)
591 bool lastshowhidden = global_settings.show_hidden_files; 592 bool lastshowhidden = global_settings.show_hidden_files;
592#ifdef HAVE_LCD_BITMAP 593#ifdef HAVE_LCD_BITMAP
593 int fw, fh; 594 int fw, fh;
594 lcd_getfontsize(FONT_UI, &fw, &fh); 595 lcd_getstringsize("A", &fw, &fh);
595 tree_max_on_screen = (LCD_HEIGHT - MARGIN_Y) / fh; 596 tree_max_on_screen = (LCD_HEIGHT - MARGIN_Y) / fh;
596#else 597#else
597 tree_max_on_screen = TREE_MAX_ON_SCREEN; 598 tree_max_on_screen = TREE_MAX_ON_SCREEN;
@@ -740,16 +741,14 @@ bool dirbrowse(char *root)
740 lcd_puts(0, 0, str(LANG_LANGUAGE_LOADED)); 741 lcd_puts(0, 0, str(LANG_LANGUAGE_LOADED));
741#else 742#else
742 lcd_getstringsize(str(LANG_LANGUAGE_LOADED), 743 lcd_getstringsize(str(LANG_LANGUAGE_LOADED),
743 FONT_UI, &fw, &fh); 744 &fw, &fh);
744 if(fw>LCD_WIDTH) 745 if(fw>LCD_WIDTH)
745 fw=0; 746 fw=0;
746 else 747 else
747 fw=LCD_WIDTH/2 - fw/2; 748 fw=LCD_WIDTH/2 - fw/2;
748 749
749 lcd_putsxy(fw, 750 lcd_putsxy(fw, LCD_HEIGHT/2 - fh/2,
750 LCD_HEIGHT/2 - fh/2, 751 str(LANG_LANGUAGE_LOADED));
751 str(LANG_LANGUAGE_LOADED),
752 FONT_UI);
753#endif 752#endif
754 lcd_update(); 753 lcd_update();
755 sleep(HZ); 754 sleep(HZ);
@@ -762,7 +761,7 @@ bool dirbrowse(char *root)
762 snprintf(buf, sizeof buf, "%s/%s", 761 snprintf(buf, sizeof buf, "%s/%s",
763 currdir, file->name); 762 currdir, file->name);
764 font_load(buf); 763 font_load(buf);
765 lcd_getfontsize(FONT_UI, &fw, &fh); 764 lcd_getstringsize("A", &fw, &fh);
766 tree_max_on_screen = (LCD_HEIGHT - MARGIN_Y) / fh; 765 tree_max_on_screen = (LCD_HEIGHT - MARGIN_Y) / fh;
767 /* make sure cursor is on screen */ 766 /* make sure cursor is on screen */
768 while ( dircursor > tree_max_on_screen ) { 767 while ( dircursor > tree_max_on_screen ) {