Merge branch 'VCENTER' into Everything

This commit is contained in:
jfrickmann
2021-07-24 17:32:48 -04:00
3 changed files with 6 additions and 2 deletions
+4 -1
View File
@@ -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
+1
View File
@@ -1861,6 +1861,7 @@ const luaR_value_entry opentxConstants[] = {
#endif
#if defined(COLORLCD)
{ "BOLD", FONT(BOLD) },
{ "VCENTER", VCENTERED },
#else
{ "BOLD", BOLD },
#endif
+1 -1
View File
@@ -511,7 +511,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) {