Remove onKeyPress() and unused getWindowsEvent()
* deleted onKeyPress() due to PR https://github.com/EdgeTX/edgetx/pull/2201 * deleted reference to getWindowEvent(), no longer used due to PR https://github.com/EdgeTX/edgetx/pull/2201 * cosmetics - remove commented out getWindowsEvent()
This commit is contained in:
@@ -26,7 +26,6 @@ static void checkbox_event_handler(lv_event_t* e)
|
|||||||
lv_obj_t* target = lv_event_get_target(e);
|
lv_obj_t* target = lv_event_get_target(e);
|
||||||
CheckBox* cb = (CheckBox*)lv_obj_get_user_data(target);
|
CheckBox* cb = (CheckBox*)lv_obj_get_user_data(target);
|
||||||
|
|
||||||
onKeyPress();
|
|
||||||
if (cb) cb->setValue(lv_obj_get_state(target) & LV_STATE_CHECKED);
|
if (cb) cb->setValue(lv_obj_get_state(target) & LV_STATE_CHECKED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -201,7 +201,6 @@ void Choice::setValue(int val)
|
|||||||
|
|
||||||
void Choice::onClicked()
|
void Choice::onClicked()
|
||||||
{
|
{
|
||||||
onKeyPress();
|
|
||||||
openMenu();
|
openMenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -134,6 +134,5 @@ bool FileChoice::openMenu()
|
|||||||
|
|
||||||
void FileChoice::onClicked()
|
void FileChoice::onClicked()
|
||||||
{
|
{
|
||||||
onKeyPress();
|
|
||||||
openMenu();
|
openMenu();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,10 +27,8 @@ uint16_t* lcdGetScratchBuffer();
|
|||||||
void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
void DMACopyBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
||||||
void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
void DMACopyAlphaBitmap(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint16_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h);
|
||||||
void DMACopyAlphaMask(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint8_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h, uint16_t bg_color);
|
void DMACopyAlphaMask(uint16_t * dest, uint16_t destw, uint16_t desth, uint16_t x, uint16_t y, const uint8_t * src, uint16_t srcw, uint16_t srch, uint16_t srcx, uint16_t srcy, uint16_t w, uint16_t h, uint16_t bg_color);
|
||||||
void onKeyPress();
|
|
||||||
void onKeyError();
|
void onKeyError();
|
||||||
void killEvents(event_t event);
|
void killEvents(event_t event);
|
||||||
event_t getWindowEvent();
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// These colors MUST be defined
|
// These colors MUST be defined
|
||||||
|
|||||||
-1
@@ -118,7 +118,6 @@ void MenuBody::onPress(size_t index)
|
|||||||
{
|
{
|
||||||
Menu *menu = getParentMenu();
|
Menu *menu = getParentMenu();
|
||||||
if (index < lines.size()) {
|
if (index < lines.size()) {
|
||||||
onKeyPress();
|
|
||||||
if (menu->multiple) {
|
if (menu->multiple) {
|
||||||
if (selectedIndex == (int)index)
|
if (selectedIndex == (int)index)
|
||||||
lines[index].onPress();
|
lines[index].onPress();
|
||||||
|
|||||||
@@ -42,7 +42,6 @@ void ModalWindow::deleteLater(bool detach, bool trash)
|
|||||||
void ModalWindow::onClicked()
|
void ModalWindow::onClicked()
|
||||||
{
|
{
|
||||||
if (closeWhenClickOutside) {
|
if (closeWhenClickOutside) {
|
||||||
onKeyPress();
|
|
||||||
deleteLater();
|
deleteLater();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,7 +71,6 @@ void NumberEdit::onEvent(event_t event)
|
|||||||
} while (isValueAvailable && !isValueAvailable(value) && value <= vmax);
|
} while (isValueAvailable && !isValueAvailable(value) && value <= vmax);
|
||||||
if (value <= vmax) {
|
if (value <= vmax) {
|
||||||
setValue(value);
|
setValue(value);
|
||||||
onKeyPress();
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
setValue(vmax);
|
setValue(vmax);
|
||||||
@@ -87,7 +86,6 @@ void NumberEdit::onEvent(event_t event)
|
|||||||
} while (isValueAvailable && !isValueAvailable(value) && value >= vmin);
|
} while (isValueAvailable && !isValueAvailable(value) && value >= vmin);
|
||||||
if (value >= vmin) {
|
if (value >= vmin) {
|
||||||
setValue(value);
|
setValue(value);
|
||||||
onKeyPress();
|
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
setValue(vmin);
|
setValue(vmin);
|
||||||
|
|||||||
@@ -259,11 +259,9 @@ void TableField::selectNext(int16_t dir)
|
|||||||
void TableField::onEvent(event_t event)
|
void TableField::onEvent(event_t event)
|
||||||
{
|
{
|
||||||
if (event == EVT_ROTARY_RIGHT) {
|
if (event == EVT_ROTARY_RIGHT) {
|
||||||
onKeyPress();
|
|
||||||
selectNext(1);
|
selectNext(1);
|
||||||
}
|
}
|
||||||
else if (event == EVT_ROTARY_LEFT) {
|
else if (event == EVT_ROTARY_LEFT) {
|
||||||
onKeyPress();
|
|
||||||
selectNext(-1);
|
selectNext(-1);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|||||||
Reference in New Issue
Block a user