2 files changed, 24 insertions, 3 deletions

diff --git a/apps/gui/line.c b/apps/gui/line.c
index 9374279b60..3d563d171c 100644
--- a/apps/gui/line.c
+++ b/apps/gui/line.c
@@ -264,7 +264,6 @@ static void style_line(struct screen *display,
     int style = line->style;
     int width = display->getwidth();
     int height = line->height == -1 ? display->getcharheight() : line->height;
-    unsigned mask = STYLE_MODE_MASK & ~STYLE_COLORED;
 
     /* mask out gradient and colorbar styles for non-color displays */
     if (display->depth < 16)
@@ -277,7 +276,7 @@ static void style_line(struct screen *display,
         style &= ~STYLE_COLORED;
     }
 
-    switch (style & mask)
+    switch (style & _STYLE_DECO_MASK)
     {
 #if (LCD_DEPTH > 1 || (defined(LCD_REMOTE_DEPTH) && LCD_REMOTE_DEPTH > 1))
         case STYLE_GRADIENT:
diff --git a/apps/gui/line.h b/apps/gui/line.h
index d5350eb410..fa1522003c 100644
--- a/apps/gui/line.h
+++ b/apps/gui/line.h
@@ -29,6 +29,28 @@
 #include "lcd.h"
 #include "screens.h"
 
+/* Possible line decoration styles. Specify one of
+ * STYLE_NONE, _DEFAULT, _INVERT, _COLORBAR or _GRADIENT, and optionally
+ * or with STYLE_COLORED specifying line_desc.text_color */
+enum line_styles {
+    /* Just print the text. Do not clear or draw line decorations */
+    STYLE_NONE       = 0x00,
+    /* Line background filled with the bg color (or backdrop if present) */ 
+    STYLE_DEFAULT    = 0x01,
+    /* Like STYLE_DFEAULT except that text and background color will be swapped */
+    STYLE_INVERT     = 0x02,
+    /* Line background filled with line color line_desc.line_color */
+    STYLE_COLORBAR   = 0x04,
+    /* Line background filled with gradient, colors taken from
+     * line_desc.line_color and line_desc.line_end_color */
+    STYLE_GRADIENT   = 0x08,
+    /* Modifier for the text color, which will be taken from line_desc.text_color */
+    STYLE_COLORED    = 0x10,
+    /* These are used internally */
+    _STYLE_DECO_MASK = 0x0f,
+    _STYLE_MODE_MASK = 0x7F,
+};
+
 struct line_desc {
     /* height of the line (in pixels). -1 to inherit the height
      * from the font. The text will be centered if the height is larger,
@@ -49,7 +71,7 @@ struct line_desc {
      * lcd format (convert with LCD_RGBPACK() if necessary) */
     fb_data line_color, line_end_color;
     /* line decorations, see STYLE_DEFAULT etc. */
-    int style;
+    enum line_styles style;
     /* whether the line can scroll */
     bool scroll;
 };