summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/gui/color_picker.c6
-rw-r--r--apps/gui/skin_engine/skin_parser.c2
-rw-r--r--apps/gui/splash.c2
-rw-r--r--apps/gui/statusbar.c2
-rw-r--r--apps/gui/viewport.c2
-rw-r--r--apps/language.c9
-rw-r--r--apps/menus/time_menu.c2
-rw-r--r--firmware/drivers/lcd-bitmap-common.c2
-rw-r--r--firmware/export/lcd.h8
9 files changed, 14 insertions, 21 deletions
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index 75c0612292..09d861245a 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -177,7 +177,7 @@ static void draw_screen(struct screen *display, char *title,
/* Draw title string */
set_drawinfo(display, DRMODE_SOLID, text_color, background_color);
- vp.flags |= VP_FLAG_CENTER_ALIGN;
+ vp.flags |= VP_FLAG_ALIGN_CENTER;
display->getstringsize(title, NULL, &y);
display->putsxy(0, MARGIN_TOP, title);
@@ -257,7 +257,7 @@ static void draw_screen(struct screen *display, char *title,
display->putsxy(text_x, text_top, buf);
/* Draw color value */
snprintf(buf, 3, "%02d", rgb->rgb_val[i]);
- vp.flags |= VP_FLAG_IS_RTL;
+ vp.flags |= VP_FLAG_ALIGN_RIGHT;
display->putsxy(text_x, text_top, buf);
/* Draw scrollbar */
@@ -278,7 +278,7 @@ static void draw_screen(struct screen *display, char *title,
/* Format RGB: #rrggbb */
snprintf(buf, sizeof(buf), str(LANG_COLOR_RGB_VALUE),
rgb->red, rgb->green, rgb->blue);
- vp.flags |= VP_FLAG_CENTER_ALIGN;
+ vp.flags |= VP_FLAG_ALIGN_CENTER;
if (display->depth >= 16)
{
/* Display color swatch on color screens only */
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index e7c9f4fb52..bd6199c5e9 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -706,7 +706,7 @@ static int parse_viewport(const char *wps_bufptr,
if (!(ptr = viewport_parse_viewport(vp, screen, ptr, '|')))
return WPS_ERROR_INVALID_PARAM;
- vp->flags &= ~VP_FLAG_IS_RTL; /* ignore rright-to-left languages */
+ vp->flags &= ~VP_FLAG_ALIGN_RIGHT; /* ignore right-to-left languages */
/* Check for trailing | */
if (*ptr != '|')
return WPS_ERROR_INVALID_PARAM;
diff --git a/apps/gui/splash.c b/apps/gui/splash.c
index aaa259c09d..4ddd22aba2 100644
--- a/apps/gui/splash.c
+++ b/apps/gui/splash.c
@@ -147,7 +147,7 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap)
if (vp.height > screen->lcdheight)
vp.height = screen->lcdheight;
- vp.flags |= VP_FLAG_CENTER_ALIGN;
+ vp.flags |= VP_FLAG_ALIGN_CENTER;
#if LCD_DEPTH > 1
if (screen->depth > 1)
{
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index 8275165178..5aac200157 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -175,7 +175,7 @@ static void gui_statusbar_init(struct gui_statusbar * bar)
#define GET_RECT(vp, vals,display) do { \
viewport_set_fullscreen(&(vp), (display)->screen_type); \
- (vp).flags &= ~VP_FLAG_IS_RTL; \
+ (vp).flags &= ~VP_FLAG_ALIGN_RIGHT; \
(vp).height = STATUSBAR_HEIGHT; \
(vp).x = STATUSBAR_X_POS; \
if ((vals) != STATUSBAR_BOTTOM) \
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index d5f45b3382..fdd06bdc46 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -369,7 +369,7 @@ 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;
+ vp->flags |= VP_FLAG_ALIGN_RIGHT;
#endif
}
diff --git a/apps/language.c b/apps/language.c
index fef8cd0a04..cdcfbe19b2 100644
--- a/apps/language.c
+++ b/apps/language.c
@@ -109,14 +109,7 @@ int lang_load(const char *filename)
retcode = 3;
}
close(fd);
- if (retcode)
- {
- lang_options = 0;
- }
- else
- {
- lang_options = lang_header[3];
- }
+ lang_options = retcode ? 0 : lang_header[3];
return retcode;
}
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c
index bc08374ba0..cb31c33fc9 100644
--- a/apps/menus/time_menu.c
+++ b/apps/menus/time_menu.c
@@ -268,7 +268,7 @@ int time_screen(void* ignored)
menu[i] = clock[i];
/* force time to be drawn centered */
- clock[i].flags |= VP_FLAG_CENTER_ALIGN;
+ clock[i].flags |= VP_FLAG_ALIGN_CENTER;
font_h = font_get(clock[i].font)->height;
if (nb_lines > 3)
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 5bf4706c59..042500cce8 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -92,7 +92,7 @@ static void LCDFN(putsxyofs)(int x, int y, int ofs, const unsigned char *str)
LCDFN(getstringsize)(str, &w, NULL);
/* center takes precedence */
- if (vp_flags & VP_FLAG_CENTER_ALIGN)
+ if (vp_flags & VP_FLAG_ALIGN_CENTER)
x = ((current_vp->width - w)/ 2) + x;
else
x = current_vp->width - w - x;
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 463714ff03..bf1680fad2 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -26,13 +26,13 @@
#include "cpu.h"
#include "config.h"
-#define VP_FLAG_IS_RTL 0x01
-#define VP_FLAG_CENTER_ALIGN 0x02
+#define VP_FLAG_ALIGN_RIGHT 0x01
+#define VP_FLAG_ALIGN_CENTER 0x02
#define VP_FLAG_ALIGNMENT_MASK \
- (VP_FLAG_IS_RTL|VP_FLAG_CENTER_ALIGN)
+ (VP_FLAG_ALIGN_RIGHT|VP_FLAG_ALIGN_CENTER)
-#define VP_IS_RTL(vp) (((vp)->flags & VP_FLAG_ALIGNMENT_MASK) == VP_FLAG_IS_RTL)
+#define VP_IS_RTL(vp) (((vp)->flags & VP_FLAG_ALIGNMENT_MASK) == VP_FLAG_ALIGN_RIGHT)
struct viewport {
int x;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 03:55:53 +0000