diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-26 12:36:25 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-26 19:52:40 +0000 |
commit | 804a49886a842495c6bb049c229d924230b85b26 (patch) | |
tree | 3a6d61c3e8ea1f7414a452ed51d5b267cc06790b /apps/recorder/icons.h | |
parent | 299c2370756baeac5ca458859ae7c64ca462f8c8 (diff) | |
download | rockbox-804a49886a842495c6bb049c229d924230b85b26.tar.gz rockbox-804a49886a842495c6bb049c229d924230b85b26.zip |
statusbar: Make statusbar height equal SYSFONT_HEIGHT
And size elements horizaontally based on SYSFONT_WIDTH
Unfortunately we need 16px icons to make 16px statusbar look right
but at least it _works_ properly now.
Also: all targets currently use 8-px SYSFONT, except some hosted bootloaders
Change-Id: I0cdf97e6ef47ec49693ef79667b200595b4fe075
Diffstat (limited to 'apps/recorder/icons.h')
-rw-r--r-- | apps/recorder/icons.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/apps/recorder/icons.h b/apps/recorder/icons.h index 66de36bcd0..249453a943 100644 --- a/apps/recorder/icons.h +++ b/apps/recorder/icons.h | |||
@@ -103,14 +103,15 @@ extern const unsigned char bitmap_icon_disk[]; | |||
103 | 103 | ||
104 | #define STATUSBAR_X_POS 0 | 104 | #define STATUSBAR_X_POS 0 |
105 | #define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */ | 105 | #define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */ |
106 | #define STATUSBAR_HEIGHT 8 | 106 | #define STATUSBAR_HEIGHT SYSFONT_HEIGHT |
107 | #define STATUSBAR_WIDTH LCD_WIDTH | 107 | #define STATUSBAR_WIDTH LCD_WIDTH |
108 | #define SB_ICON_HEIGHT 8 /* ... for now */ | ||
108 | #define ICON_BATTERY_X_POS 0 | 109 | #define ICON_BATTERY_X_POS 0 |
109 | #define ICON_BATTERY_WIDTH 18 | 110 | #define ICON_BATTERY_WIDTH (2+(2*SYSFONT_WIDTH)) |
110 | #define ICON_PLUG_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+2 | 111 | #define ICON_PLUG_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+2 |
111 | #define ICON_PLUG_WIDTH 7 | 112 | #define ICON_PLUG_WIDTH 7 |
112 | #define ICON_VOLUME_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+2+2 | 113 | #define ICON_VOLUME_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+2+2 |
113 | #define ICON_VOLUME_WIDTH 16 | 114 | #define ICON_VOLUME_WIDTH (2+(2*SYSFONT_WIDTH)) |
114 | #define ICON_PLAY_STATE_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+2+2+2 | 115 | #define ICON_PLAY_STATE_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+2+2+2 |
115 | #define ICON_PLAY_STATE_WIDTH 7 | 116 | #define ICON_PLAY_STATE_WIDTH 7 |
116 | #define ICON_PLAY_MODE_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+ICON_PLAY_STATE_WIDTH+2+2+2+2 | 117 | #define ICON_PLAY_MODE_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+ICON_PLAY_STATE_WIDTH+2+2+2+2 |
@@ -123,5 +124,9 @@ extern const unsigned char bitmap_icon_disk[]; | |||
123 | #define ICON_DISK_X_POS STATUSBAR_WIDTH-ICON_DISK_WIDTH | 124 | #define ICON_DISK_X_POS STATUSBAR_WIDTH-ICON_DISK_WIDTH |
124 | #define TIME_X_END STATUSBAR_WIDTH-1 | 125 | #define TIME_X_END STATUSBAR_WIDTH-1 |
125 | 126 | ||
127 | #if defined(SYSFONT_HEIGHT) && (SB_ICON_HEIGHT > STATUSBAR_HEIGHT) | ||
128 | #error "Icons larger than statusbar!" | ||
129 | #endif | ||
130 | |||
126 | #endif /* PLUGIN */ | 131 | #endif /* PLUGIN */ |
127 | #endif /* _ICONS_H_ */ | 132 | #endif /* _ICONS_H_ */ |