window: prevent focus events while mass-deleting
This commit is contained in:
committed by
Raphael Coeffic
parent
bc793651f4
commit
ad658a92a4
@@ -29,6 +29,7 @@ std::list<Window *> Window::trash;
|
|||||||
extern lv_obj_t *virtual_kb;
|
extern lv_obj_t *virtual_kb;
|
||||||
|
|
||||||
static bool is_scrolling = false;
|
static bool is_scrolling = false;
|
||||||
|
static bool inhibit_focus = false;
|
||||||
|
|
||||||
static void window_event_cb(lv_event_t * e)
|
static void window_event_cb(lv_event_t * e)
|
||||||
{
|
{
|
||||||
@@ -136,6 +137,7 @@ static void window_event_cb(lv_event_t * e)
|
|||||||
window->setScrollPositionX(scroll_x);
|
window->setScrollPositionX(scroll_x);
|
||||||
|
|
||||||
} else if (code == LV_EVENT_FOCUSED) {
|
} else if (code == LV_EVENT_FOCUSED) {
|
||||||
|
if (inhibit_focus) return;
|
||||||
bool focused = ((Window *)target->user_data)->hasFocus();
|
bool focused = ((Window *)target->user_data)->hasFocus();
|
||||||
TRACE_WINDOWS("FOCUSED[%d] %s", focused,
|
TRACE_WINDOWS("FOCUSED[%d] %s", focused,
|
||||||
window->getWindowDebugString().c_str());
|
window->getWindowDebugString().c_str());
|
||||||
@@ -307,10 +309,13 @@ void Window::clearLvgl()
|
|||||||
|
|
||||||
void Window::deleteChildren()
|
void Window::deleteChildren()
|
||||||
{
|
{
|
||||||
|
// prevent LVGL refocus while mass-deleting
|
||||||
|
inhibit_focus = true;
|
||||||
for (auto window: children) {
|
for (auto window: children) {
|
||||||
window->clearLvgl();
|
window->clearLvgl();
|
||||||
window->deleteLater(false);
|
window->deleteLater(false);
|
||||||
}
|
}
|
||||||
|
inhibit_focus = false;
|
||||||
children.clear();
|
children.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user