pushEvent insteado of putEvent

This commit is contained in:
Bertrand Songis
2021-03-12 11:07:31 +01:00
parent 59cef7ebc7
commit 889f645c1a
11 changed files with 23 additions and 23 deletions
+1 -1
View File
@@ -248,7 +248,7 @@ void menuChannelsViewCommon(event_t event);
#define IS_ROTARY_LONG(evt) (evt == EVT_ROTARY_LONG)
#define IS_ROTARY_EVENT(evt) (EVT_KEY_MASK(evt) >= 0x0e)
void repeatLastCursorMove(event_t event);
#define REPEAT_LAST_CURSOR_MOVE() { if (EVT_KEY_MASK(event) >= 0x0e) putEvent(event); else repeatLastCursorMove(event); }
#define REPEAT_LAST_CURSOR_MOVE() { if (EVT_KEY_MASK(event) >= 0x0e) pushEvent(event); else repeatLastCursorMove(event); }
#else
#define IS_ROTARY_LEFT(evt) (0)
#define IS_ROTARY_RIGHT(evt) (0)
+1 -1
View File
@@ -280,7 +280,7 @@ void menuChannelsView(event_t event);
#define CURSOR_MOVED_RIGHT(event) (EVT_KEY_MASK(event) == KEY_RIGHT)
#endif
#define REPEAT_LAST_CURSOR_MOVE() { if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) putEvent(event); else menuHorizontalPosition = 0; }
#define REPEAT_LAST_CURSOR_MOVE() { if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) pushEvent(event); else menuHorizontalPosition = 0; }
#define POS_HORZ_INIT(posVert) ((COLATTR(posVert) & NAVIGATION_LINE_BY_LINE) ? -1 : 0)
#define EDIT_MODE_INIT 0 // TODO enum
+6 -6
View File
@@ -32,42 +32,42 @@ CurveKeyboard::CurveKeyboard() :
// up
new TextButton(this, {LCD_W / 2 - 20, 5, 40, 40}, "\200",
[=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_UP);
pushEvent(EVT_VIRTUAL_KEY_UP);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// down
new TextButton(this, {LCD_W / 2 - 20, 65, 40, 40}, "\201",
[=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_DOWN);
pushEvent(EVT_VIRTUAL_KEY_DOWN);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// left
left = new TextButton(this, {LCD_W / 2 - 70, 35, 40, 40}, "\177",
[=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_LEFT);
pushEvent(EVT_VIRTUAL_KEY_LEFT);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// right
right = new TextButton(this, {LCD_W / 2 + 30, 35, 40, 40}, "\176",
[=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_RIGHT);
pushEvent(EVT_VIRTUAL_KEY_RIGHT);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// next
new TextButton(this, {LCD_W / 2 + 80, 35, 60, 40}, "Next",
[=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_NEXT);
pushEvent(EVT_VIRTUAL_KEY_NEXT);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
// previous
new TextButton(this, {LCD_W / 2 - 140, 35, 60, 40}, "Prev",
[=]() -> uint8_t {
putEvent(EVT_VIRTUAL_KEY_PREVIOUS);
pushEvent(EVT_VIRTUAL_KEY_PREVIOUS);
return 0;
}, BUTTON_BACKGROUND | OPAQUE | NO_FOCUS);
+4 -4
View File
@@ -230,7 +230,7 @@ void onDeleteModelConfirm(const char * result)
int modelIndex = MODEL_INDEX();
modelslist.removeModel(currentCategory, currentModel);
s_copyMode = 0;
putEvent(EVT_REFRESH);
pushEvent(EVT_REFRESH);
if (modelIndex > 0) {
modelIndex--;
}
@@ -467,7 +467,7 @@ bool menuModelSelect(event_t event)
if (s_editMode == 0 || event == EVT_KEY_BREAK(KEY_EXIT)) {
modelslist.save();
selectMode = MODE_SELECT_MODEL;
putEvent(EVT_REFRESH);
pushEvent(EVT_REFRESH);
}
}
else {
@@ -503,7 +503,7 @@ bool menuModelSelect(event_t event)
if (selectMode == MODE_SELECT_MODEL) {
if (navigate(event, index, 4, 2) != 0) {
setCurrentModel(MODEL_INDEX());
putEvent(EVT_REFRESH);
pushEvent(EVT_REFRESH);
}
}
else if (selectMode == MODE_MOVE_MODEL) {
@@ -511,7 +511,7 @@ bool menuModelSelect(event_t event)
if (direction) {
modelslist.moveModel(currentCategory, currentModel, direction);
setCurrentModel(MODEL_INDEX());
putEvent(EVT_REFRESH);
pushEvent(EVT_REFRESH);
}
}
}
+1 -1
View File
@@ -55,7 +55,7 @@ int checkIncDecSelection = 0;
void repeatLastCursorMove(event_t event)
{
if (CURSOR_MOVED_LEFT(event) || CURSOR_MOVED_RIGHT(event)) {
putEvent(event);
pushEvent(event);
}
else {
menuHorizontalPosition = 0;