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

More beeps

Browse Source
This commit is contained in:
Bertrand Songis
2021-02-18 15:22:02 +01:00
parent 7714454264
commit d47ca1994b
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/form.cpp
Vendored
+11 -1
View File
@@ -39,19 +39,23 @@ void FormField::onEvent(event_t event)
if (event == EVT_ROTARY_RIGHT/*EVT_KEY_BREAK(KEY_DOWN)*/) {
if (next) {
onKeyPress();
next->setFocus(SET_FOCUS_FORWARD);
}
}
else if (event == EVT_ROTARY_LEFT/*EVT_KEY_BREAK(KEY_UP)*/) {
if (previous) {
onKeyPress();
previous->setFocus(SET_FOCUS_BACKWARD);
}
}
else if (event == EVT_KEY_BREAK(KEY_ENTER)) {
onKeyPress();
setEditMode(!editMode);
invalidate();
}
else if (event == EVT_KEY_BREAK(KEY_EXIT) && editMode) {
onKeyPress();
setEditMode(false);
invalidate();
}
@@ -210,15 +214,19 @@ void FormGroup::onEvent(event_t event)
TRACE_WINDOWS("%s received event 0x%X", getWindowDebugString("FormGroup").c_str(), event);
if (event == EVT_KEY_BREAK(KEY_ENTER)) {
onKeyPress();
setFocusOnFirstVisibleField(SET_FOCUS_FIRST);
}
else if (event == EVT_KEY_BREAK(KEY_EXIT) && !hasFocus() && !(windowFlags & FORM_FORWARD_FOCUS)) {
onKeyPress();
setFocus(SET_FOCUS_DEFAULT); // opentx - model - timers settings
}
else if (event == EVT_ROTARY_RIGHT && !next) {
onKeyPress();
setFocusOnFirstVisibleField(SET_FOCUS_FIRST);
}
else if (event == EVT_ROTARY_LEFT && !previous) {
onKeyPress();
setFocusOnLastVisibleField(SET_FOCUS_BACKWARD);
}
else {
@@ -245,10 +253,12 @@ void FormWindow::onEvent(event_t event)
TRACE_WINDOWS("%s received event 0x%X", getWindowDebugString("FormWindow").c_str(), event);
if (event == EVT_KEY_BREAK(KEY_EXIT) && (windowFlags & FORM_FORWARD_FOCUS) && first) {
onKeyPress();
Window * currentFocus = getFocus();
first->setFocus(SET_FOCUS_FIRST);
if (getFocus() != currentFocus)
if (getFocus() != currentFocus) {
return;
}
}
FormGroup::onEvent(event);
radio/src/thirdparty/libopenui/src/menu.cpp
Vendored
+11 -3
View File
@@ -36,15 +36,20 @@ void MenuBody::onEvent(event_t event)
TRACE_WINDOWS("%s received event 0x%X", getWindowDebugString().c_str(), event);
if (event == EVT_ROTARY_RIGHT) {
if (!lines.empty())
if (!lines.empty()) {
select(int((selectedIndex + 1) % lines.size()));
onKeyPress();
}
}
else if (event == EVT_ROTARY_LEFT) {
if (!lines.empty())
if (!lines.empty()) {
select(int(selectedIndex <= 0 ? lines.size() - 1 : selectedIndex - 1));
onKeyPress();
}
}
else if (event == EVT_KEY_BREAK(KEY_ENTER)) {
if (!lines.empty()) {
onKeyPress();
if (selectedIndex < 0) {
select(0);
}
@@ -62,8 +67,10 @@ void MenuBody::onEvent(event_t event)
}
}
else if (event == EVT_KEY_BREAK(KEY_EXIT)) {
if (onCancel)
onKeyPress();
if (onCancel) {
onCancel();
}
Window::onEvent(event);
}
else {
@@ -78,6 +85,7 @@ bool MenuBody::onTouchEnd(coord_t /*x*/, coord_t y)
Menu * menu = getParentMenu();
int index = y / MENUS_LINE_HEIGHT;
if (index < (int)lines.size()) {
onKeyPress();
if (menu->multiple) {
if (selectedIndex == index)
lines[index].onPress();