From 09e47a35cbd537f7e847ce7dbde581ef4fc38494 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 21 Jan 2021 17:09:52 +0100 Subject: [PATCH] Added Window::getTextFlags() --- radio/src/thirdparty/libopenui/src/libopenui_defines.h | 3 ++- radio/src/thirdparty/libopenui/src/window.h | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/radio/src/thirdparty/libopenui/src/libopenui_defines.h b/radio/src/thirdparty/libopenui/src/libopenui_defines.h index 3606bd4b1..b076d120b 100644 --- a/radio/src/thirdparty/libopenui/src/libopenui_defines.h +++ b/radio/src/thirdparty/libopenui/src/libopenui_defines.h @@ -81,7 +81,8 @@ #define ARGB(a, r, g, b) (uint16_t)((((a) & 0xF0) << 8) + (((r) & 0xF0) << 4) + (((g) & 0xF0) << 0) + (((b) & 0xF0) >> 4)) #define COLOR(index) LcdFlags(unsigned(index) << 16u) -#define COLOR_IDX(att) uint8_t((att) >> 16u) +#define COLOR_IDX(flags) uint8_t((flags) >> 16u) +#define COLOR_MASK(flags) ((flags) & 0xFFFF0000u) #define DEFAULT_COLOR COLOR(DEFAULT_COLOR_INDEX) #define DEFAULT_BGCOLOR COLOR(DEFAULT_BGCOLOR_INDEX) diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/thirdparty/libopenui/src/window.h index 08e013840..89ca45a18 100644 --- a/radio/src/thirdparty/libopenui/src/window.h +++ b/radio/src/thirdparty/libopenui/src/window.h @@ -122,6 +122,11 @@ class Window windowFlags = flags; } + LcdFlags getTextFlags() const + { + return textFlags; + } + void setTextFlags(LcdFlags flags) { textFlags = flags;