summaryrefslogtreecommitdiff
path: root/apps/tree.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/tree.c')
-rw-r--r--apps/tree.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/apps/tree.c b/apps/tree.c
index e159c3465f..316139427d 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -399,9 +399,8 @@ static int update_dir(void)
399 } 399 }
400 } 400 }
401#ifdef HAVE_TAGCACHE 401#ifdef HAVE_TAGCACHE
402 if (id3db) 402 if (id3db)
403 { 403 {
404#ifdef HAVE_LCD_BITMAP
405 if (global_settings.show_path_in_browser == SHOW_PATH_FULL 404 if (global_settings.show_path_in_browser == SHOW_PATH_FULL
406 || global_settings.show_path_in_browser == SHOW_PATH_CURRENT) 405 || global_settings.show_path_in_browser == SHOW_PATH_CURRENT)
407 { 406 {
@@ -412,13 +411,11 @@ static int update_dir(void)
412 { 411 {
413 /* Must clear the title as the list is reused */ 412 /* Must clear the title as the list is reused */
414 gui_synclist_set_title(&tree_lists, NULL, NOICON); 413 gui_synclist_set_title(&tree_lists, NULL, NOICON);
415 } 414 }
416#endif
417 } 415 }
418 else 416 else
419#endif 417#endif
420 { 418 {
421#ifdef HAVE_LCD_BITMAP
422 if (tc.browse && tc.browse->title) 419 if (tc.browse && tc.browse->title)
423 { 420 {
424 int icon = tc.browse->icon; 421 int icon = tc.browse->icon;
@@ -448,8 +445,7 @@ static int update_dir(void)
448 { 445 {
449 /* Must clear the title as the list is reused */ 446 /* Must clear the title as the list is reused */
450 gui_synclist_set_title(&tree_lists, NULL, NOICON); 447 gui_synclist_set_title(&tree_lists, NULL, NOICON);
451 } 448 }
452#endif
453 } 449 }
454 450
455 gui_synclist_set_nb_items(&tree_lists, tc.filesindir); 451 gui_synclist_set_nb_items(&tree_lists, tc.filesindir);
@@ -606,9 +602,7 @@ static int dirbrowse(void)
606 char buf[MAX_PATH]; 602 char buf[MAX_PATH];
607 int len; 603 int len;
608 int button; 604 int button;
609#ifdef HAVE_LCD_BITMAP
610 int oldbutton; 605 int oldbutton;
611#endif
612 bool reload_root = false; 606 bool reload_root = false;
613 int lastfilter = *tc.dirfilter; 607 int lastfilter = *tc.dirfilter;
614 bool lastsortcase = global_settings.sort_case; 608 bool lastsortcase = global_settings.sort_case;
@@ -643,7 +637,7 @@ static int dirbrowse(void)
643 splash(HZ*2, ID2P(LANG_NO_FILES)); 637 splash(HZ*2, ID2P(LANG_NO_FILES));
644 return GO_TO_PREVIOUS; /* No files found for rockbox_browse() */ 638 return GO_TO_PREVIOUS; /* No files found for rockbox_browse() */
645 } 639 }
646 640
647 gui_synclist_draw(&tree_lists); 641 gui_synclist_draw(&tree_lists);
648 while(1) { 642 while(1) {
649 bool restore = false; 643 bool restore = false;
@@ -653,9 +647,7 @@ static int dirbrowse(void)
653 keyclick_set_callback(gui_synclist_keyclick_callback, &tree_lists); 647 keyclick_set_callback(gui_synclist_keyclick_callback, &tree_lists);
654 button = get_action(CONTEXT_TREE, 648 button = get_action(CONTEXT_TREE,
655 list_do_action_timeout(&tree_lists, HZ/2)); 649 list_do_action_timeout(&tree_lists, HZ/2));
656#ifdef HAVE_LCD_BITMAP
657 oldbutton = button; 650 oldbutton = button;
658#endif
659 gui_synclist_do_button(&tree_lists, &button,LIST_WRAP_UNLESS_HELD); 651 gui_synclist_do_button(&tree_lists, &button,LIST_WRAP_UNLESS_HELD);
660 tc.selected_item = gui_synclist_get_sel_pos(&tree_lists); 652 tc.selected_item = gui_synclist_get_sel_pos(&tree_lists);
661 switch ( button ) { 653 switch ( button ) {