diff options
Diffstat (limited to 'apps/gui/viewport.c')
-rw-r--r-- | apps/gui/viewport.c | 13 |
1 files changed, 6 insertions, 7 deletions
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 @@ | |||
62 | static int statusbar_enabled = 0; | 62 | static int statusbar_enabled = 0; |
63 | 63 | ||
64 | #ifdef HAVE_LCD_BITMAP | 64 | #ifdef HAVE_LCD_BITMAP |
65 | static void viewport_rtl_handler(struct viewport *vp); | 65 | static void set_default_align_flags(struct viewport *vp); |
66 | 66 | ||
67 | static struct { | 67 | static struct { |
68 | struct viewport* vp; | 68 | struct viewport* vp; |
@@ -109,7 +109,7 @@ void viewport_set_fullscreen(struct viewport *vp, | |||
109 | vp->width = screens[screen].lcdwidth; | 109 | vp->width = screens[screen].lcdwidth; |
110 | 110 | ||
111 | #ifdef HAVE_LCD_BITMAP | 111 | #ifdef HAVE_LCD_BITMAP |
112 | viewport_rtl_handler(vp); | 112 | set_default_align_flags(vp); |
113 | vp->drawmode = DRMODE_SOLID; | 113 | vp->drawmode = DRMODE_SOLID; |
114 | vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */ | 114 | vp->font = FONT_UI; /* default to UI to discourage SYSFONT use */ |
115 | 115 | ||
@@ -245,7 +245,7 @@ void viewportmanager_theme_changed(const int which) | |||
245 | else if (which & THEME_LANGUAGE) | 245 | else if (which & THEME_LANGUAGE) |
246 | { /* THEME_UI_VIEWPORT handles rtl already */ | 246 | { /* THEME_UI_VIEWPORT handles rtl already */ |
247 | FOR_NB_SCREENS(i) | 247 | FOR_NB_SCREENS(i) |
248 | viewport_rtl_handler(&custom_vp[i]); | 248 | set_default_align_flags(&custom_vp[i]); |
249 | } | 249 | } |
250 | if (which & THEME_STATUSBAR) | 250 | if (which & THEME_STATUSBAR) |
251 | { | 251 | { |
@@ -364,14 +364,13 @@ bool viewport_point_within_vp(const struct viewport *vp, | |||
364 | 364 | ||
365 | #ifdef HAVE_LCD_BITMAP | 365 | #ifdef HAVE_LCD_BITMAP |
366 | 366 | ||
367 | static void viewport_rtl_handler(struct viewport *vp) | 367 | static void set_default_align_flags(struct viewport *vp) |
368 | { | 368 | { |
369 | vp->flags &= ~VP_FLAG_ALIGNMENT_MASK; | ||
369 | #ifndef __PCTOOL__ | 370 | #ifndef __PCTOOL__ |
370 | if (UNLIKELY(lang_is_rtl())) | 371 | if (UNLIKELY(lang_is_rtl())) |
371 | vp->flags |= VP_FLAG_IS_RTL; | 372 | vp->flags |= VP_FLAG_IS_RTL; |
372 | else | ||
373 | #endif | 373 | #endif |
374 | vp->flags &= ~VP_FLAG_IS_RTL; | ||
375 | } | 374 | } |
376 | 375 | ||
377 | const char* viewport_parse_viewport(struct viewport *vp, | 376 | const char* viewport_parse_viewport(struct viewport *vp, |
@@ -456,7 +455,7 @@ const char* viewport_parse_viewport(struct viewport *vp, | |||
456 | 455 | ||
457 | /* Set the defaults for fields not user-specified */ | 456 | /* Set the defaults for fields not user-specified */ |
458 | vp->drawmode = DRMODE_SOLID; | 457 | vp->drawmode = DRMODE_SOLID; |
459 | viewport_rtl_handler(vp); | 458 | set_default_align_flags(vp); |
460 | 459 | ||
461 | return ptr; | 460 | return ptr; |
462 | } | 461 | } |