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

make splash_progress lock to screen width on repeated calls

Browse source 
when calling splash, splash_progress repeatedly text rearranges and
the width changes leaving artifacts on the screen from the previously
displayed prompt

save the max width seen between calls to ensure the splash
prompt is never more narrow.

Height could be stored in a
similar manner but I deemed it unnecessary as typically the
text gets longer and the prompt increases in height
while the reflow causes the prompt to get more narrow.

keep track of the current activity and reset the max_width
when activities change (except bootloader)

Change-Id: I3303bd9135ab1d7bcf28bd5c28d0ab5346bf2697
This commit is contained in:
William Wilgus 2025-02-27 12:28:37 -05:00
parent ac8714dd64
commit cebbbb9ea4
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
apps/gui/splash.c
View file

@ -32,6 +32,9 @@
#include "strptokspn_r.h"
#include "scrollbar.h"
#include "font.h"
#ifndef BOOTLOADER
#include "misc.h" /* get_current_activity */
#endif
static long progress_next_tick = 0;
@ -43,6 +46,20 @@ static long progress_next_tick = 0;
static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
struct viewport *vp, int addl_lines)
{
static int max_width[NB_SCREENS] = {2*RECT_SPACING};
#ifndef BOOTLOADER
static enum current_activity last_act = ACTIVITY_UNKNOWN;
enum current_activity act = get_current_activity();
if (last_act != act) /* changed activities reset max_width */
{
FOR_NB_SCREENS(i)
max_width[i] = 2*RECT_SPACING;
last_act = act;
}
#endif
/* prevent screen artifacts by keeping the max width seen */
int min_width = max_width[screen->screen_type];
char splash_buf[MAXBUFFER];
struct splash_lines {
const char *str;
@ -56,7 +73,7 @@ static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
int y, i;
int space_w, w, chr_h;
int width, height;
int maxw = 0;
int maxw = min_width - 2*RECT_SPACING;
int fontnum = vp->font;
char lastbrkchr;
@ -146,6 +163,9 @@ static bool splash_internal(struct screen * screen, const char *fmt, va_list ap,
vp->width = width;
vp->height = height;
/* prevent artifacts by locking to max width observed on repeated calls */
max_width[screen->screen_type] = width;
vp->flags |= VP_FLAG_ALIGN_CENTER;
#if LCD_DEPTH > 1
unsigned fg = 0, bg = 0;