From cebbbb9ea4d1bede281538ad44b19e577c176b9a Mon Sep 17 00:00:00 2001
From: William Wilgus <wilgus.william@gmail.com>
Date: Thu, 27 Feb 2025 12:28:37 -0500
Subject: [PATCH] make splash_progress lock to screen width on repeated calls

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
---
 apps/gui/splash.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index 848a847e83..c970056375 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -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;