2 files changed, 10 insertions, 23 deletions

diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index 10a6885f92..aaa259c09d 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -48,7 +48,6 @@
 static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
 {
     char splash_buf[MAXBUFFER];
-    short widths[MAXLINES];
     char *lines[MAXLINES];
 
     char *next;
@@ -95,7 +94,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
             if (x + (next - lastbreak) * space_w + w
                     > screen->lcdwidth - RECT_SPACING*2)
             {   /* too wide, wrap */
-                widths[line] = x;
 #ifdef HAVE_LCD_BITMAP
                 if (x > maxw)
                     maxw = x;
@@ -118,7 +116,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
         next = strtok_r(NULL, " ", &store);
         if (!next)
         {   /* no more words */
-            widths[line] = x;
 #ifdef HAVE_LCD_BITMAP
             if (x > maxw)
                 maxw = x;
@@ -149,7 +146,8 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
         vp.width = screen->lcdwidth;
     if (vp.height > screen->lcdheight)
         vp.height = screen->lcdheight;
-    
+
+    vp.flags |=  VP_FLAG_CENTER_ALIGN;
 #if LCD_DEPTH > 1
     if (screen->depth > 1)
     {
@@ -179,7 +177,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
     y = RECT_SPACING;
 #else /* HAVE_LCD_CHARCELLS */
     y = 0;    /* vertical centering on 2 lines would be silly */
-    x = 0;
     screen->clear_display();
 #endif
 
@@ -187,19 +184,10 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
     for (i = 0; i <= line; i++, y+=h)
     {
 #ifdef HAVE_LCD_BITMAP
-#define W (vp.width - RECT_SPACING*2)
-#else
-#define W (screens->lcdwidth)
-#endif
-        x = (W - widths[i])/2;
-        if (x < 0)
-            x = 0;
-#ifdef HAVE_LCD_BITMAP
-        screen->putsxy(x+RECT_SPACING, y, lines[i]);
+        screen->putsxy(0, y, lines[i]);
 #else
-        screen->puts(x, y, lines[i]);
+        screen->puts(0, y, lines[i]);
 #endif
-#undef W
     }
     screen->update_viewport();
 end:
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 6f9abb74a0..d5f45b3382 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -62,7 +62,7 @@
 static int statusbar_enabled = 0;
 
 #ifdef HAVE_LCD_BITMAP
-static void viewport_rtl_handler(struct viewport *vp);
+static void set_default_align_flags(struct viewport *vp);
 
 static struct {
     struct  viewport* vp;
@@ -109,7 +109,7 @@ void viewport_set_fullscreen(struct viewport *vp,
     vp->width = screens[screen].lcdwidth;
 
 #ifdef HAVE_LCD_BITMAP
-    viewport_rtl_handler(vp);
+    set_default_align_flags(vp);
     vp->drawmode = DRMODE_SOLID;
     vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */
         
@@ -245,7 +245,7 @@ void viewportmanager_theme_changed(const int which)
     else if (which & THEME_LANGUAGE)
     {   /* THEME_UI_VIEWPORT handles rtl already */
         FOR_NB_SCREENS(i)
-            viewport_rtl_handler(&custom_vp[i]);
+            set_default_align_flags(&custom_vp[i]);
     }
     if (which & THEME_STATUSBAR)
     {
@@ -364,14 +364,13 @@ bool viewport_point_within_vp(const struct viewport *vp,
 
 #ifdef HAVE_LCD_BITMAP
 
-static void viewport_rtl_handler(struct viewport *vp)
+static void set_default_align_flags(struct viewport *vp)
 {
+    vp->flags &= ~VP_FLAG_ALIGNMENT_MASK;
 #ifndef __PCTOOL__
     if (UNLIKELY(lang_is_rtl()))
         vp->flags |= VP_FLAG_IS_RTL;
-    else
 #endif
-        vp->flags &= ~VP_FLAG_IS_RTL;
 }
 
 const char* viewport_parse_viewport(struct viewport *vp,
@@ -456,7 +455,7 @@ const char* viewport_parse_viewport(struct viewport *vp,
 
     /* Set the defaults for fields not user-specified */
     vp->drawmode = DRMODE_SOLID;
-    viewport_rtl_handler(vp);
+    set_default_align_flags(vp);
 
     return ptr;
 }