Merge BUTTON_NOFOCUS and FORM_NOFOCUS into NO_FOCUS

This commit is contained in:
Bertrand Songis
2019-10-23 17:17:10 +02:00
parent d2322526eb
commit 51f9fd97f5
4 changed files with 9 additions and 9 deletions
+6 -6
View File
@@ -34,42 +34,42 @@ CurveKeyboard::CurveKeyboard() :
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_UP); putEvent(EVT_VIRTUAL_KEY_UP);
return 0; return 0;
}, BUTTON_BACKGROUND | BUTTON_NOFOCUS); }, BUTTON_BACKGROUND | NO_FOCUS);
// down // down
new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201", new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_DOWN); putEvent(EVT_VIRTUAL_KEY_DOWN);
return 0; return 0;
}, BUTTON_BACKGROUND | BUTTON_NOFOCUS); }, BUTTON_BACKGROUND | NO_FOCUS);
// left // left
left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177", left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_LEFT); putEvent(EVT_VIRTUAL_KEY_LEFT);
return 0; return 0;
}, BUTTON_BACKGROUND | BUTTON_NOFOCUS); }, BUTTON_BACKGROUND | NO_FOCUS);
// right // right
right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176", right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_RIGHT); putEvent(EVT_VIRTUAL_KEY_RIGHT);
return 0; return 0;
}, BUTTON_BACKGROUND | BUTTON_NOFOCUS); }, BUTTON_BACKGROUND | NO_FOCUS);
// next // next
new TextButton(this, {LCD_W / 2 + 80, 35, 60, 40}, "Next", new TextButton(this, {LCD_W / 2 + 80, 35, 60, 40}, "Next",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_NEXT); putEvent(EVT_VIRTUAL_KEY_NEXT);
return 0; return 0;
}, BUTTON_BACKGROUND | BUTTON_NOFOCUS); }, BUTTON_BACKGROUND | NO_FOCUS);
// previous // previous
new TextButton(this, {LCD_W / 2 - 140, 35, 60, 40}, "Prev", new TextButton(this, {LCD_W / 2 - 140, 35, 60, 40}, "Prev",
[=]() -> uint8_t { [=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_PREVIOUS); putEvent(EVT_VIRTUAL_KEY_PREVIOUS);
return 0; return 0;
}, BUTTON_BACKGROUND | BUTTON_NOFOCUS); }, BUTTON_BACKGROUND | NO_FOCUS);
} }
+1 -1
View File
@@ -30,7 +30,7 @@ PageHeader::PageHeader(Page * parent, uint8_t icon):
[=]() -> uint8_t { [=]() -> uint8_t {
parent->deleteLater(); parent->deleteLater();
return 0; return 0;
}, BUTTON_NOFOCUS) }, NO_FOCUS)
#endif #endif
{ {
} }
+1 -1
View File
@@ -34,7 +34,7 @@ TabsGroupHeader::TabsGroupHeader(TabsGroup * parent, uint8_t icon):
[=]() -> uint8_t { [=]() -> uint8_t {
parent->deleteLater(); parent->deleteLater();
return 1; return 1;
}, BUTTON_NOFOCUS), }, NO_FOCUS),
#endif #endif
icon(icon), icon(icon),
carousel(this, parent) carousel(this, parent)
+1 -1
View File
@@ -161,7 +161,7 @@ ViewMain::ViewMain(bool icons):
[=]() -> uint8_t { [=]() -> uint8_t {
openMenu(); openMenu();
return 0; return 0;
}, BUTTON_NOFOCUS); }, NO_FOCUS);
#endif #endif
} }