diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2008-12-31 05:59:26 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2008-12-31 05:59:26 +0000 |
commit | e385ee18ce501e26189d5a2a68d092104720df30 (patch) | |
tree | 5219051887835d9750d80f71d9849ceb3aa65d82 /apps/plugins | |
parent | 54919ae9176bd9cbffc8412f0c831f471b8ac4d5 (diff) | |
download | rockbox-e385ee18ce501e26189d5a2a68d092104720df30.tar.gz rockbox-e385ee18ce501e26189d5a2a68d092104720df30.zip |
Decouple the statusbar drawing from the rest of the screen drawing. it is not drawn roughly 4x per second automatically.
viewport_Set_defaults() will setup the given viewport with the correct "full screen" dimensions (so start at 0,0 if statusbars are disabled or 0,8 if they are enabled.)
All screens should keep the statusbar enabled, but if you really want to ignore the user setting you can disbaled it with viewportmanager_set_statusbar(false).
This commit also includes some menu/list viewport cleanups from kugel in FS#9603
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19622 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/calendar.c | 1 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.c | 1 | ||||
-rw-r--r-- | apps/plugins/keybox.c | 1 | ||||
-rw-r--r-- | apps/plugins/lib/oldmenuapi.c | 3 | ||||
-rw-r--r-- | apps/plugins/shortcuts/shortcuts_view.c | 2 | ||||
-rw-r--r-- | apps/plugins/star.c | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox_keyb.c | 6 |
7 files changed, 0 insertions, 18 deletions
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 17b98c7f56..55771de919 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -674,7 +674,6 @@ static bool view_events(int selected, struct shown *shown) | |||
674 | 674 | ||
675 | while (!exit) | 675 | while (!exit) |
676 | { | 676 | { |
677 | rb->gui_syncstatusbar_draw(rb->statusbars, true); | ||
678 | button = rb->get_action(CONTEXT_LIST,TIMEOUT_BLOCK); | 677 | button = rb->get_action(CONTEXT_LIST,TIMEOUT_BLOCK); |
679 | rb->gui_synclist_do_button(&gui_memos,&button,LIST_WRAP_UNLESS_HELD); | 678 | rb->gui_synclist_do_button(&gui_memos,&button,LIST_WRAP_UNLESS_HELD); |
680 | 679 | ||
diff --git a/apps/plugins/chessbox/chessbox_pgn.c b/apps/plugins/chessbox/chessbox_pgn.c index 1aff214332..8c92573b75 100644 --- a/apps/plugins/chessbox/chessbox_pgn.c +++ b/apps/plugins/chessbox/chessbox_pgn.c | |||
@@ -640,7 +640,6 @@ struct pgn_game_node* pgn_show_game_list(const struct plugin_api* api, | |||
640 | rb->gui_synclist_select_item(&games_list, 0); | 640 | rb->gui_synclist_select_item(&games_list, 0); |
641 | 641 | ||
642 | while (true) { | 642 | while (true) { |
643 | rb->gui_syncstatusbar_draw(rb->statusbars, true); | ||
644 | rb->gui_synclist_draw(&games_list); | 643 | rb->gui_synclist_draw(&games_list); |
645 | curr_selection = rb->gui_synclist_get_sel_pos(&games_list); | 644 | curr_selection = rb->gui_synclist_get_sel_pos(&games_list); |
646 | button = rb->get_action(CONTEXT_LIST,TIMEOUT_BLOCK); | 645 | button = rb->get_action(CONTEXT_LIST,TIMEOUT_BLOCK); |
diff --git a/apps/plugins/keybox.c b/apps/plugins/keybox.c index dae413ccbc..6ec86f6950 100644 --- a/apps/plugins/keybox.c +++ b/apps/plugins/keybox.c | |||
@@ -556,7 +556,6 @@ static int keybox(void) | |||
556 | 556 | ||
557 | while (!done) | 557 | while (!done) |
558 | { | 558 | { |
559 | rb->gui_syncstatusbar_draw(rb->statusbars, true); | ||
560 | rb->gui_synclist_draw(&kb_list); | 559 | rb->gui_synclist_draw(&kb_list); |
561 | button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); | 560 | button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); |
562 | if (rb->gui_synclist_do_button(&kb_list, &button, LIST_WRAP_ON)) | 561 | if (rb->gui_synclist_do_button(&kb_list, &button, LIST_WRAP_ON)) |
diff --git a/apps/plugins/lib/oldmenuapi.c b/apps/plugins/lib/oldmenuapi.c index b83f926532..a48a61bca6 100644 --- a/apps/plugins/lib/oldmenuapi.c +++ b/apps/plugins/lib/oldmenuapi.c | |||
@@ -98,7 +98,6 @@ int menu_show(int m) | |||
98 | int key; | 98 | int key; |
99 | 99 | ||
100 | rb->gui_synclist_draw(&(menus[m].synclist)); | 100 | rb->gui_synclist_draw(&(menus[m].synclist)); |
101 | rb->gui_syncstatusbar_draw(rb->statusbars, true); | ||
102 | while (!exit) { | 101 | while (!exit) { |
103 | key = rb->get_action(CONTEXT_MAINMENU,HZ/2); | 102 | key = rb->get_action(CONTEXT_MAINMENU,HZ/2); |
104 | /* | 103 | /* |
@@ -126,7 +125,6 @@ int menu_show(int m) | |||
126 | return MENU_ATTACHED_USB; | 125 | return MENU_ATTACHED_USB; |
127 | break; | 126 | break; |
128 | } | 127 | } |
129 | rb->gui_syncstatusbar_draw(rb->statusbars, false); | ||
130 | } | 128 | } |
131 | return MENU_SELECTED_EXIT; | 129 | return MENU_SELECTED_EXIT; |
132 | } | 130 | } |
@@ -149,7 +147,6 @@ bool menu_run(int m) | |||
149 | if (menus[m].items[selected].function && | 147 | if (menus[m].items[selected].function && |
150 | menus[m].items[selected].function()) | 148 | menus[m].items[selected].function()) |
151 | return true; | 149 | return true; |
152 | rb->gui_syncstatusbar_draw(rb->statusbars, true); | ||
153 | } | 150 | } |
154 | } | 151 | } |
155 | } | 152 | } |
diff --git a/apps/plugins/shortcuts/shortcuts_view.c b/apps/plugins/shortcuts/shortcuts_view.c index 09b25480e8..eb3cb9506c 100644 --- a/apps/plugins/shortcuts/shortcuts_view.c +++ b/apps/plugins/shortcuts/shortcuts_view.c | |||
@@ -58,8 +58,6 @@ enum sc_list_action_type draw_sc_list(struct gui_synclist gui_sc) | |||
58 | rb->gui_synclist_draw(&gui_sc); | 58 | rb->gui_synclist_draw(&gui_sc); |
59 | 59 | ||
60 | while (true) { | 60 | while (true) { |
61 | /* draw the statusbar, should be done often */ | ||
62 | rb->gui_syncstatusbar_draw(rb->statusbars, true); | ||
63 | /* user input */ | 61 | /* user input */ |
64 | button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); | 62 | button = rb->get_action(CONTEXT_LIST, TIMEOUT_BLOCK); |
65 | if (rb->gui_synclist_do_button(&gui_sc, &button, | 63 | if (rb->gui_synclist_do_button(&gui_sc, &button, |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index f358755e2a..c217fb922f 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -1008,9 +1008,6 @@ static int star_menu(void) | |||
1008 | FOR_NB_SCREENS(selection) | 1008 | FOR_NB_SCREENS(selection) |
1009 | { | 1009 | { |
1010 | rb->viewport_set_defaults(&vp[selection], selection); | 1010 | rb->viewport_set_defaults(&vp[selection], selection); |
1011 | /* we are hiding the statusbar so fix the height also */ | ||
1012 | vp[selection].y = 0; | ||
1013 | vp[selection].height = rb->screens[selection]->lcdheight; | ||
1014 | #if LCD_DEPTH > 1 | 1011 | #if LCD_DEPTH > 1 |
1015 | if (rb->screens[selection]->depth > 1) | 1012 | if (rb->screens[selection]->depth > 1) |
1016 | { | 1013 | { |
@@ -1112,7 +1109,6 @@ static int star_menu(void) | |||
1112 | level--; | 1109 | level--; |
1113 | star_run_game(level); | 1110 | star_run_game(level); |
1114 | } | 1111 | } |
1115 | |||
1116 | return PLUGIN_OK; | 1112 | return PLUGIN_OK; |
1117 | } | 1113 | } |
1118 | 1114 | ||
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 7ae3862fc2..36f1d519d9 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -443,8 +443,6 @@ int zx_kbd_input(char* text/*, int buflen*/) | |||
443 | rb->screens[l]->set_drawmode(DRMODE_SOLID); | 443 | rb->screens[l]->set_drawmode(DRMODE_SOLID); |
444 | } | 444 | } |
445 | 445 | ||
446 | |||
447 | /* gui_syncstatusbar_draw(&statusbars, true);*/ | ||
448 | FOR_NB_SCREENS(l) | 446 | FOR_NB_SCREENS(l) |
449 | rb->screens[l]->update(); | 447 | rb->screens[l]->update(); |
450 | 448 | ||
@@ -554,10 +552,6 @@ int zx_kbd_input(char* text/*, int buflen*/) | |||
554 | } | 552 | } |
555 | break; | 553 | break; |
556 | 554 | ||
557 | case BUTTON_NONE: | ||
558 | /*gui_syncstatusbar_draw(&statusbars, false);*/ | ||
559 | |||
560 | break; | ||
561 | 555 | ||
562 | default: | 556 | default: |
563 | if(rb->default_event_handler(button) == SYS_USB_CONNECTED) | 557 | if(rb->default_event_handler(button) == SYS_USB_CONNECTED) |