diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-06 00:29:46 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-03-06 00:29:46 +0000 |
commit | a9b5f4d810903996d868b0fcdcf9859cf3f47d7d (patch) | |
tree | 4acbdcace28f00451d5b5c9687cc53c6f997886c /apps/gui/statusbar.h | |
parent | 43ed678b4645a48cf2072ab72c93e730f4d329ff (diff) | |
download | rockbox-a9b5f4d810903996d868b0fcdcf9859cf3f47d7d.tar.gz rockbox-a9b5f4d810903996d868b0fcdcf9859cf3f47d7d.zip |
cleanup statusbar+base skin relationship...
* remove the "custom" option from the statusbar setting. if a sbs file is set then statusbar setting is ignored, no other user visible change there.
* new tag, %wi - use to draw the inbuilt statusbar in the current viewport
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25038 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/statusbar.h')
-rw-r--r-- | apps/gui/statusbar.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h index 0233b56baf..281cf3f5b9 100644 --- a/apps/gui/statusbar.h +++ b/apps/gui/statusbar.h | |||
@@ -55,8 +55,7 @@ struct status_info { | |||
55 | }; | 55 | }; |
56 | 56 | ||
57 | /* statusbar visibility/position, used for settings also */ | 57 | /* statusbar visibility/position, used for settings also */ |
58 | enum statusbar_values { STATUSBAR_OFF = 0, STATUSBAR_TOP, STATUSBAR_BOTTOM, | 58 | enum statusbar_values { STATUSBAR_OFF = 0, STATUSBAR_TOP, STATUSBAR_BOTTOM }; |
59 | STATUSBAR_CUSTOM }; | ||
60 | 59 | ||
61 | struct gui_statusbar | 60 | struct gui_statusbar |
62 | { | 61 | { |
@@ -92,7 +91,8 @@ extern struct gui_syncstatusbar statusbars; | |||
92 | * Draws the status bar on the attached screen | 91 | * Draws the status bar on the attached screen |
93 | * - bar : the statusbar structure | 92 | * - bar : the statusbar structure |
94 | */ | 93 | */ |
95 | extern void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw); | 94 | extern void gui_statusbar_draw(struct gui_statusbar * bar, |
95 | bool force_redraw, struct viewport *vp); | ||
96 | 96 | ||
97 | 97 | ||
98 | struct gui_syncstatusbar | 98 | struct gui_syncstatusbar |
@@ -103,8 +103,6 @@ struct gui_syncstatusbar | |||
103 | extern void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) INIT_ATTR; | 103 | extern void gui_syncstatusbar_init(struct gui_syncstatusbar * bars) INIT_ATTR; |
104 | extern void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, | 104 | extern void gui_syncstatusbar_draw(struct gui_syncstatusbar * bars, |
105 | bool force_redraw); | 105 | bool force_redraw); |
106 | void gui_statusbar_changed(enum screen_type screen, | ||
107 | enum statusbar_values old); | ||
108 | #if !defined(HAVE_REMOTE_LCD) || defined(__PCTOOL__) | 106 | #if !defined(HAVE_REMOTE_LCD) || defined(__PCTOOL__) |
109 | #include "settings.h" | 107 | #include "settings.h" |
110 | #define statusbar_position(a) ((enum statusbar_values)global_settings.statusbar) | 108 | #define statusbar_position(a) ((enum statusbar_values)global_settings.statusbar) |