From 2e129af9f194e41244efa4be15407f907a6c6b7a Mon Sep 17 00:00:00 2001 From: jfrickmann Date: Mon, 19 Jul 2021 09:20:10 -0400 Subject: [PATCH] Added VCENTER to lcd flags Only for COLORLCD --- radio/src/lua/api_colorlcd.cpp | 5 ++++- radio/src/lua/api_general.cpp | 1 + radio/src/lua/widgets.cpp | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/radio/src/lua/api_colorlcd.cpp b/radio/src/lua/api_colorlcd.cpp index cff137481..6381f04ed 100644 --- a/radio/src/lua/api_colorlcd.cpp +++ b/radio/src/lua/api_colorlcd.cpp @@ -47,7 +47,10 @@ static int8_t getTextVerticalOffset(LcdFlags flags) if (font_index >= sizeof(text_vertical_offset)) { return 0; } - return text_vertical_offset[font_index]; + int vcenter = 0; + if (flags & VCENTERED) + vcenter = 0.5 * getFontHeight(flags & 0xFFFF); + return text_vertical_offset[font_index] - vcenter; } /*luadoc diff --git a/radio/src/lua/api_general.cpp b/radio/src/lua/api_general.cpp index 9cd4db639..b15f437e0 100644 --- a/radio/src/lua/api_general.cpp +++ b/radio/src/lua/api_general.cpp @@ -1860,6 +1860,7 @@ const luaR_value_entry opentxConstants[] = { #endif #if defined(COLORLCD) { "BOLD", FONT(BOLD) }, + { "VCENTER", VCENTERED }, #else { "BOLD", BOLD }, #endif diff --git a/radio/src/lua/widgets.cpp b/radio/src/lua/widgets.cpp index a5d3dae8b..0b1d90c66 100644 --- a/radio/src/lua/widgets.cpp +++ b/radio/src/lua/widgets.cpp @@ -360,7 +360,7 @@ void LuaWidget::background() { if (lsWidgets == 0 || errorMessage) return; - TRACE("LuaWidget::background()"); + // TRACE("LuaWidget::background()"); luaSetInstructionsLimit(lsWidgets, WIDGET_SCRIPTS_MAX_INSTRUCTIONS); LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory; if (factory->backgroundFunction) {