piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Make SYS Tools Lua entries larger for easier touch (#1265)

Browse Source 
fixed 376 by making each line 10 pixels higher.
This commit is contained in:
Peter Feerick
2021-12-18 12:20:24 +10:00
committed by GitHub
parent 8afcf1f1ce ee74bd408b
commit b0c328dd19
1 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_tools.cpp
+73 -31
View File
@@ -84,12 +84,47 @@ inline bool LuaScript_compare_nocase(LuaScript first, LuaScript second)
return strcasecmp(first.label.c_str(), second.label.c_str()) < 0;
}
void buildLuaUi(std::vector<LuaScript> luaScripts, FormWindow *window, FormGridLayout &grid)
class FormGridLayoutEx : public FormGridLayout
{
public:
using FormGridLayout::FormGridLayout;
void setLineHeight(uint8_t lineHeight)
{
_lineHeight = lineHeight;
}
rect_t getFieldSlot(uint8_t count = 1, uint8_t index = 0) const
{
auto rect = FormGridLayout::getFieldSlot(count, index);
rect.h = _lineHeight;
return rect;
}
rect_t getLabelSlot(bool indent = false) const
{
auto rect = FormGridLayout::getLabelSlot(indent);
rect.h = _lineHeight;
return rect;
}
void nextLine(coord_t height=PAGE_LINE_HEIGHT)
{
if (height == PAGE_LINE_HEIGHT)
height = _lineHeight;
spacer(height + PAGE_LINE_SPACING);
}
protected:
uint8_t _lineHeight = PAGE_LINE_HEIGHT;
};
void buildLuaUi(std::vector<LuaScript> luaScripts, FormWindow *window, FormGridLayoutEx &grid)
{
for (auto luaScript : luaScripts) {
auto txt = new StaticText(window, grid.getLabelSlot(), "lua",
BUTTON_BACKGROUND, COLOR_THEME_PRIMARY1 | CENTERED);
auto txt =
new StaticText(window, grid.getLabelSlot(), "lua", BUTTON_BACKGROUND,
COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
auto b = new TextButton(
window, grid.getFieldSlot(1), luaScript.label,
[window, luaScript]() -> uint8_t {
@@ -111,10 +146,10 @@ void buildLuaUi(std::vector<LuaScript> luaScripts, FormWindow *window, FormGridL
b->setFocusHandler([=](bool focus) {
if (focus) {
txt->setBackgroundColor(COLOR_THEME_FOCUS);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED | VCENTERED);
} else {
txt->setBackgroundColor(COLOR_THEME_SECONDARY2);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
}
txt->invalidate();
});
@@ -122,9 +157,11 @@ void buildLuaUi(std::vector<LuaScript> luaScripts, FormWindow *window, FormGridL
}
}
void RadioToolsPage::rebuild(FormWindow * window)
{
FormGridLayout grid;
FormGridLayoutEx grid;
grid.setLineHeight(PAGE_LINE_HEIGHT + 10);
grid.spacer(PAGE_PADDING);
grid.setLabelWidth(100);
@@ -181,8 +218,9 @@ void RadioToolsPage::rebuild(FormWindow * window)
reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE]
.information.modelID,
MODULE_OPTION_SPECTRUM_ANALYSER)) {
auto txt = new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND,
COLOR_THEME_PRIMARY1 | CENTERED);
auto txt =
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND,
COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
auto b = new TextButton(
window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_INT,
[=]() -> uint8_t {
@@ -194,10 +232,10 @@ void RadioToolsPage::rebuild(FormWindow * window)
b->setFocusHandler([=](bool focus) {
if (focus) {
txt->setBackgroundColor(COLOR_THEME_FOCUS);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED | VCENTERED);
} else {
txt->setBackgroundColor(COLOR_THEME_SECONDARY2);
txt->setTextFlags(CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
}
txt->invalidate();
});
@@ -208,8 +246,9 @@ void RadioToolsPage::rebuild(FormWindow * window)
reusableBuffer.hardwareAndSettings.modules[INTERNAL_MODULE]
.information.modelID,
MODULE_OPTION_POWER_METER)) {
auto txt = new StaticText(window, grid.getLabelSlot(), "access",
BUTTON_BACKGROUND, COLOR_THEME_PRIMARY1 | CENTERED);
auto txt =
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND,
COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
auto b = new TextButton(
window, grid.getFieldSlot(1), STR_POWER_METER_INT,
[=]() -> uint8_t {
@@ -221,10 +260,10 @@ void RadioToolsPage::rebuild(FormWindow * window)
b->setFocusHandler([=](bool focus) {
if (focus) {
txt->setBackgroundColor(COLOR_THEME_FOCUS);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED | VCENTERED);
} else {
txt->setBackgroundColor(COLOR_THEME_SECONDARY2);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
}
txt->invalidate();
});
@@ -233,8 +272,9 @@ void RadioToolsPage::rebuild(FormWindow * window)
#endif
#if defined(INTERNAL_MODULE_MULTI)
{
auto txt = new StaticText(window, grid.getLabelSlot(), "multi",
BUTTON_BACKGROUND, COLOR_THEME_PRIMARY1 | CENTERED);
auto txt =
new StaticText(window, grid.getLabelSlot(), "multi", BUTTON_BACKGROUND,
COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
auto b = new TextButton(
window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_INT,
[=]() -> uint8_t {
@@ -246,10 +286,10 @@ void RadioToolsPage::rebuild(FormWindow * window)
b->setFocusHandler([=](bool focus) {
if (focus) {
txt->setBackgroundColor(COLOR_THEME_FOCUS);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED | VCENTERED);
} else {
txt->setBackgroundColor(COLOR_THEME_SECONDARY2);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
}
txt->invalidate();
});
@@ -262,9 +302,10 @@ void RadioToolsPage::rebuild(FormWindow * window)
.information.modelID,
MODULE_OPTION_SPECTRUM_ANALYSER) ||
isModuleMultimodule(EXTERNAL_MODULE)) {
auto txt = new StaticText(window, grid.getLabelSlot(),
isModuleMultimodule(EXTERNAL_MODULE) ? "multi" : "access",
BUTTON_BACKGROUND, COLOR_THEME_PRIMARY1 | CENTERED);
auto txt = new StaticText(
window, grid.getLabelSlot(),
isModuleMultimodule(EXTERNAL_MODULE) ? "multi" : "access",
BUTTON_BACKGROUND, COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
auto b = new TextButton(
window, grid.getFieldSlot(1), STR_SPECTRUM_ANALYSER_EXT,
[=]() -> uint8_t {
@@ -276,10 +317,10 @@ void RadioToolsPage::rebuild(FormWindow * window)
b->setFocusHandler([=](bool focus) {
if (focus) {
txt->setBackgroundColor(COLOR_THEME_FOCUS);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED | VCENTERED);
} else {
txt->setBackgroundColor(COLOR_THEME_SECONDARY2);
txt->setTextFlags(CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
}
txt->invalidate();
});
@@ -292,8 +333,9 @@ void RadioToolsPage::rebuild(FormWindow * window)
reusableBuffer.hardwareAndSettings.modules[EXTERNAL_MODULE]
.information.modelID,
MODULE_OPTION_POWER_METER)) {
auto txt = new StaticText(window, grid.getLabelSlot(), "access",
BUTTON_BACKGROUND, COLOR_THEME_PRIMARY1 | CENTERED);
auto txt =
new StaticText(window, grid.getLabelSlot(), "access", BUTTON_BACKGROUND,
COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
auto b = new TextButton(
window, grid.getFieldSlot(1), STR_POWER_METER_EXT,
[=]() -> uint8_t {
@@ -305,10 +347,10 @@ void RadioToolsPage::rebuild(FormWindow * window)
b->setFocusHandler([=](bool focus) {
if (focus) {
txt->setBackgroundColor(COLOR_THEME_FOCUS);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED | VCENTERED);
} else {
txt->setBackgroundColor(COLOR_THEME_SECONDARY2);
txt->setTextFlags(CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
}
txt->invalidate();
});
@@ -320,7 +362,7 @@ void RadioToolsPage::rebuild(FormWindow * window)
#if defined(GHOST)
if (isModuleGhost(EXTERNAL_MODULE)) {
auto txt = new StaticText(window, grid.getLabelSlot(), "ghost",
BUTTON_BACKGROUND, CENTERED);
BUTTON_BACKGROUND, CENTERED | VCENTERED);
auto b = new TextButton(
window, grid.getFieldSlot(1), "Ghost module config",
[=]() -> uint8_t {
@@ -332,10 +374,10 @@ void RadioToolsPage::rebuild(FormWindow * window)
b->setFocusHandler([=](bool focus) {
if (focus) {
txt->setBackgroundColor(COLOR_THEME_FOCUS);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY2 | CENTERED | VCENTERED);
} else {
txt->setBackgroundColor(COLOR_THEME_SECONDARY2);
txt->setTextFlags(CENTERED);
txt->setTextFlags(COLOR_THEME_PRIMARY1 | CENTERED | VCENTERED);
}
txt->invalidate();
});