len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

statusbar: Make statusbar height equal SYSFONT_HEIGHT

Browse source 
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
This commit is contained in:
Solomon Peachy 2020-10-26 12:36:25 -04:00
parent 299c237075
commit 804a49886a
6 changed files with 31 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/gui/statusbar-skinned.c
View file

@ -38,6 +38,7 @@
#include "debug.h" #include "debug.h"
#include "font.h" #include "font.h"
#include "icon.h" #include "icon.h"
#include "icons.h"
#include "option_select.h" #include "option_select.h"
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
#include "sound.h" #include "sound.h"

32
apps/gui/statusbar.c
View file

@ -49,7 +49,7 @@
but still needed for compatibility with old system */ but still needed for compatibility with old system */
#define ICONS_SPACING 2 #define ICONS_SPACING 2
#define STATUSBAR_BATTERY_X_POS 0*ICONS_SPACING #define STATUSBAR_BATTERY_X_POS 0*ICONS_SPACING
#define STATUSBAR_BATTERY_WIDTH 18 #define STATUSBAR_BATTERY_WIDTH (2+(2*SYSFONT_WIDTH))
#define STATUSBAR_PLUG_X_POS STATUSBAR_X_POS + \ #define STATUSBAR_PLUG_X_POS STATUSBAR_X_POS + \
STATUSBAR_BATTERY_WIDTH + \ STATUSBAR_BATTERY_WIDTH + \
ICONS_SPACING ICONS_SPACING
@ -58,7 +58,7 @@
STATUSBAR_BATTERY_WIDTH + \ STATUSBAR_BATTERY_WIDTH + \
STATUSBAR_PLUG_WIDTH + \ STATUSBAR_PLUG_WIDTH + \
2*ICONS_SPACING 2*ICONS_SPACING
#define STATUSBAR_VOLUME_WIDTH 16 #define STATUSBAR_VOLUME_WIDTH (2+(2*SYSFONT_WIDTH))
#define STATUSBAR_ENCODER_X_POS STATUSBAR_X_POS + \ #define STATUSBAR_ENCODER_X_POS STATUSBAR_X_POS + \
STATUSBAR_BATTERY_WIDTH + \ STATUSBAR_BATTERY_WIDTH + \
STATUSBAR_PLUG_WIDTH + \ STATUSBAR_PLUG_WIDTH + \
@ -281,7 +281,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
display->mono_bitmap(bitmap_icons_7x8[Icon_USBPlug], display->mono_bitmap(bitmap_icons_7x8[Icon_USBPlug],
STATUSBAR_PLUG_X_POS, STATUSBAR_PLUG_X_POS,
STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH, STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH,
STATUSBAR_HEIGHT); SB_ICON_HEIGHT);
#endif /* HAVE_USB_POWER */ #endif /* HAVE_USB_POWER */
#if CONFIG_CHARGING #if CONFIG_CHARGING
#ifdef HAVE_USB_POWER #ifdef HAVE_USB_POWER
@ -292,7 +292,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
display->mono_bitmap(bitmap_icons_7x8[Icon_Plug], display->mono_bitmap(bitmap_icons_7x8[Icon_Plug],
STATUSBAR_PLUG_X_POS, STATUSBAR_PLUG_X_POS,
STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH, STATUSBAR_Y_POS, STATUSBAR_PLUG_WIDTH,
STATUSBAR_HEIGHT); SB_ICON_HEIGHT);
#endif /* CONFIG_CHARGING */ #endif /* CONFIG_CHARGING */
#ifdef HAVE_RECORDING #ifdef HAVE_RECORDING
/* turn off volume display in recording screen */ /* turn off volume display in recording screen */
@ -453,7 +453,7 @@ static bool gui_statusbar_icon_volume(struct gui_statusbar * bar, int volume)
if (volume == minvol) { if (volume == minvol) {
display->mono_bitmap(bitmap_icons_7x8[Icon_Mute], display->mono_bitmap(bitmap_icons_7x8[Icon_Mute],
STATUSBAR_VOLUME_X_POS + STATUSBAR_VOLUME_WIDTH / 2 - 4, STATUSBAR_VOLUME_X_POS + STATUSBAR_VOLUME_WIDTH / 2 - 4,
STATUSBAR_Y_POS, 7, STATUSBAR_HEIGHT); STATUSBAR_Y_POS, 7, SB_ICON_HEIGHT);
} }
else { else {
/* We want to redraw the icon later on */ /* We want to redraw the icon later on */
@ -505,7 +505,7 @@ static void gui_statusbar_icon_play_state(struct screen * display, int state)
{ {
display->mono_bitmap(bitmap_icons_7x8[state], STATUSBAR_PLAY_STATE_X_POS, display->mono_bitmap(bitmap_icons_7x8[state], STATUSBAR_PLAY_STATE_X_POS,
STATUSBAR_Y_POS, STATUSBAR_PLAY_STATE_WIDTH, STATUSBAR_Y_POS, STATUSBAR_PLAY_STATE_WIDTH,
STATUSBAR_HEIGHT); SB_ICON_HEIGHT);
} }
/* /*
@ -515,7 +515,7 @@ static void gui_statusbar_icon_play_mode(struct screen * display, int mode)
{ {
display->mono_bitmap(bitmap_icons_7x8[mode], STATUSBAR_PLAY_MODE_X_POS, display->mono_bitmap(bitmap_icons_7x8[mode], STATUSBAR_PLAY_MODE_X_POS,
STATUSBAR_Y_POS, STATUSBAR_PLAY_MODE_WIDTH, STATUSBAR_Y_POS, STATUSBAR_PLAY_MODE_WIDTH,
STATUSBAR_HEIGHT); SB_ICON_HEIGHT);
} }
/* /*
@ -525,7 +525,7 @@ static void gui_statusbar_icon_shuffle(struct screen * display)
{ {
display->mono_bitmap(bitmap_icons_7x8[Icon_Shuffle], display->mono_bitmap(bitmap_icons_7x8[Icon_Shuffle],
STATUSBAR_SHUFFLE_X_POS, STATUSBAR_Y_POS, STATUSBAR_SHUFFLE_X_POS, STATUSBAR_Y_POS,
STATUSBAR_SHUFFLE_WIDTH, STATUSBAR_HEIGHT); STATUSBAR_SHUFFLE_WIDTH, SB_ICON_HEIGHT);
} }
/* /*
@ -535,7 +535,7 @@ static void gui_statusbar_icon_lock(struct screen * display)
{ {
display->mono_bitmap(bitmap_icons_5x8[Icon_Lock_Main], display->mono_bitmap(bitmap_icons_5x8[Icon_Lock_Main],
STATUSBAR_LOCKM_X_POS, STATUSBAR_Y_POS, STATUSBAR_LOCKM_X_POS, STATUSBAR_Y_POS,
STATUSBAR_LOCKM_WIDTH, STATUSBAR_HEIGHT); STATUSBAR_LOCKM_WIDTH, SB_ICON_HEIGHT);
} }
#ifdef HAS_REMOTE_BUTTON_HOLD #ifdef HAS_REMOTE_BUTTON_HOLD
@ -546,7 +546,7 @@ static void gui_statusbar_icon_lock_remote(struct screen * display)
{ {
display->mono_bitmap(bitmap_icons_5x8[Icon_Lock_Remote], display->mono_bitmap(bitmap_icons_5x8[Icon_Lock_Remote],
STATUSBAR_LOCKR_X_POS, STATUSBAR_Y_POS, STATUSBAR_LOCKR_X_POS, STATUSBAR_Y_POS,
STATUSBAR_LOCKR_WIDTH, STATUSBAR_HEIGHT); STATUSBAR_LOCKR_WIDTH, SB_ICON_HEIGHT);
} }
#endif #endif
@ -559,7 +559,7 @@ static void gui_statusbar_led(struct screen * display)
display->mono_bitmap(bitmap_icon_disk, display->mono_bitmap(bitmap_icon_disk,
STATUSBAR_DISK_X_POS(display->getwidth()), STATUSBAR_DISK_X_POS(display->getwidth()),
STATUSBAR_Y_POS, STATUSBAR_DISK_WIDTH, STATUSBAR_Y_POS, STATUSBAR_DISK_WIDTH,
STATUSBAR_HEIGHT); SB_ICON_HEIGHT);
} }
#endif #endif
@ -609,7 +609,7 @@ static int write_bitmap_number(struct screen * display, int value,
for (ptr = buf; *ptr != '\0'; ptr++, x += BM_GLYPH_WIDTH) for (ptr = buf; *ptr != '\0'; ptr++, x += BM_GLYPH_WIDTH)
display->mono_bitmap(bitmap_glyphs_4x8[*ptr - '0'], x, y, display->mono_bitmap(bitmap_glyphs_4x8[*ptr - '0'], x, y,
BM_GLYPH_WIDTH, STATUSBAR_HEIGHT); BM_GLYPH_WIDTH, SB_ICON_HEIGHT);
return x; return x;
} }
@ -649,7 +649,7 @@ static void gui_statusbar_write_format_info(struct screen * display)
/* Show bitmap - clipping right edge if needed */ /* Show bitmap - clipping right edge if needed */
display->mono_bitmap_part(bm, 0, 0, STATUSBAR_ENCODER_WIDTH, display->mono_bitmap_part(bm, 0, 0, STATUSBAR_ENCODER_WIDTH,
xpos, STATUSBAR_Y_POS, width, STATUSBAR_HEIGHT); xpos, STATUSBAR_Y_POS, width, SB_ICON_HEIGHT);
if (rec_format == REC_FORMAT_MPA_L3) if (rec_format == REC_FORMAT_MPA_L3)
{ {
@ -688,7 +688,7 @@ static void gui_statusbar_write_samplerate_info(struct screen * display)
/* write the 'k' */ /* write the 'k' */
display->mono_bitmap(bitmap_glyphs_4x8[Glyph_4x8_k], xpos, display->mono_bitmap(bitmap_glyphs_4x8[Glyph_4x8_k], xpos,
STATUSBAR_Y_POS, BM_GLYPH_WIDTH, STATUSBAR_Y_POS, BM_GLYPH_WIDTH,
STATUSBAR_HEIGHT); SB_ICON_HEIGHT);
} }
static void gui_statusbar_icon_recording_info(struct screen * display) static void gui_statusbar_icon_recording_info(struct screen * display)
@ -704,13 +704,13 @@ static void gui_statusbar_icon_recording_info(struct screen * display)
{ {
display->mono_bitmap(bitmap_icons_5x8[Icon_Mono], display->mono_bitmap(bitmap_icons_5x8[Icon_Mono],
STATUSBAR_RECCHANNELS_X_POS , STATUSBAR_Y_POS, STATUSBAR_RECCHANNELS_X_POS , STATUSBAR_Y_POS,
STATUSBAR_RECCHANNELS_WIDTH, STATUSBAR_HEIGHT); STATUSBAR_RECCHANNELS_WIDTH, SB_ICON_HEIGHT);
} }
else else
{ {
display->mono_bitmap(bitmap_icons_5x8[Icon_Stereo], display->mono_bitmap(bitmap_icons_5x8[Icon_Stereo],
STATUSBAR_RECCHANNELS_X_POS, STATUSBAR_Y_POS, STATUSBAR_RECCHANNELS_X_POS, STATUSBAR_Y_POS,
STATUSBAR_RECCHANNELS_WIDTH, STATUSBAR_HEIGHT); STATUSBAR_RECCHANNELS_WIDTH, SB_ICON_HEIGHT);
} }
} }
#endif /* HAVE_RECORDING */ #endif /* HAVE_RECORDING */

4
apps/gui/statusbar.h
View file

@ -28,10 +28,6 @@
#include "screen_access.h" #include "screen_access.h"
#include "events.h" #include "events.h"
#define STATUSBAR_X_POS 0
#define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */
#define STATUSBAR_HEIGHT 8
struct status_info { struct status_info {
int battlevel; int battlevel;
int batt_charge_step; int batt_charge_step;

11
apps/recorder/icons.h
View file

@ -103,14 +103,15 @@ extern const unsigned char bitmap_icon_disk[];
#define STATUSBAR_X_POS 0 #define STATUSBAR_X_POS 0
#define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */ #define STATUSBAR_Y_POS 0 /* MUST be a multiple of 8 */
#define STATUSBAR_HEIGHT 8 #define STATUSBAR_HEIGHT SYSFONT_HEIGHT
#define STATUSBAR_WIDTH LCD_WIDTH #define STATUSBAR_WIDTH LCD_WIDTH
#define SB_ICON_HEIGHT 8 /* ... for now */
#define ICON_BATTERY_X_POS 0 #define ICON_BATTERY_X_POS 0
#define ICON_BATTERY_WIDTH 18 #define ICON_BATTERY_WIDTH (2+(2*SYSFONT_WIDTH))
#define ICON_PLUG_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+2 #define ICON_PLUG_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+2
#define ICON_PLUG_WIDTH 7 #define ICON_PLUG_WIDTH 7
#define ICON_VOLUME_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+2+2 #define ICON_VOLUME_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+2+2
#define ICON_VOLUME_WIDTH 16 #define ICON_VOLUME_WIDTH (2+(2*SYSFONT_WIDTH))
#define ICON_PLAY_STATE_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+2+2+2 #define ICON_PLAY_STATE_X_POS STATUSBAR_X_POS+ICON_BATTERY_WIDTH+ICON_PLUG_WIDTH+ICON_VOLUME_WIDTH+2+2+2
#define ICON_PLAY_STATE_WIDTH 7 #define ICON_PLAY_STATE_WIDTH 7
#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 #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[];
#define ICON_DISK_X_POS STATUSBAR_WIDTH-ICON_DISK_WIDTH #define ICON_DISK_X_POS STATUSBAR_WIDTH-ICON_DISK_WIDTH
#define TIME_X_END STATUSBAR_WIDTH-1 #define TIME_X_END STATUSBAR_WIDTH-1
#if defined(SYSFONT_HEIGHT) && (SB_ICON_HEIGHT > STATUSBAR_HEIGHT)
#error "Icons larger than statusbar!"
#endif
#endif /* PLUGIN */ #endif /* PLUGIN */
#endif /* _ICONS_H_ */ #endif /* _ICONS_H_ */

2
apps/recorder/peakmeter.c
View file

@ -1311,7 +1311,7 @@ void peak_meter_draw_trig(int xpos[], int ypos[],
HORIZONTAL); HORIZONTAL);
screens[i].mono_bitmap(bitmap_icons_7x8[icon], ixpos[i], ypos[i], screens[i].mono_bitmap(bitmap_icons_7x8[icon], ixpos[i], ypos[i],
ICON_PLAY_STATE_WIDTH, STATUSBAR_HEIGHT); ICON_PLAY_STATE_WIDTH, SB_ICON_HEIGHT);
} }
} }
#endif #endif

9
tools/configure vendored
View file

@ -4057,7 +4057,7 @@ fi
t_cpu="hosted" t_cpu="hosted"
t_manufacturer="xduoo" t_manufacturer="xduoo"
t_model="xduoo_x3ii" t_model="xduoo_x3ii"
sysfont="16-Terminus" sysfontbl="16-Terminus"
;; ;;
243|xduoox20) 243|xduoox20)
@ -4080,7 +4080,7 @@ fi
t_cpu="hosted" t_cpu="hosted"
t_manufacturer="xduoo" t_manufacturer="xduoo"
t_model="xduoo_x20" t_model="xduoo_x20"
sysfont="16-Terminus" sysfontbl="16-Terminus"
;; ;;
244|fiiom3k) 244|fiiom3k)
@ -4103,7 +4103,7 @@ fi
t_manufacturer="fiio" t_manufacturer="fiio"
t_model="m3k" t_model="m3k"
mipsellinuxcc mipsellinuxcc
sysfont="16-Terminus" sysfontbl="16-Terminus"
;; ;;
245|aigoerosq|erosq) 245|aigoerosq|erosq)
@ -4126,7 +4126,7 @@ fi
t_cpu="hosted" t_cpu="hosted"
t_manufacturer="aigo" t_manufacturer="aigo"
t_model="erosq" t_model="erosq"
sysfont="16-Terminus" sysfontbl="16-Terminus"
;; ;;
250|ihifi770c) 250|ihifi770c)
@ -4307,6 +4307,7 @@ fi
fi fi
extradefines="$extradefines -DBOOTLOADER -ffunction-sections -fdata-sections" extradefines="$extradefines -DBOOTLOADER -ffunction-sections -fdata-sections"
bootloader="1" bootloader="1"
if [ -n "${sysfontbl}" ] ; then sysfont=$sysfontbl ; fi
echo "Bootloader build selected" echo "Bootloader build selected"
;; ;;
[Ss]) [Ss])