Fix focus issues with number edit.

Author: philmoz

radio/src/thirdparty/libopenui/src/numberedit.cpp

@@ -45,6 +45,14 @@ class NumberArea : public FormField
 
     lv_obj_add_event_cb(lvobj, NumberArea::numberedit_cb, LV_EVENT_KEY, this);
 
+    setFocusHandler([=](bool focus) {
+      if (!focus && editMode) {
+        setEditMode(false);
+        hide();
+        lv_obj_clear_state(parent->getLvObj(), LV_STATE_FOCUSED);
+      }
+    });
+
     update();
   }
 
@@ -317,7 +325,8 @@ void NumberEdit::openEdit()
         this->vmin, this->vmax, _getValue, _setValue, textFlags);
     edit->setChangeHandler([=]() {
       update();
-      lv_group_focus_obj(lvobj);
+      if (edit->hasFocus())
+        lv_group_focus_obj(lvobj);
       edit->hide();
     });
     edit->setCancelHandler([=]() {

radio/src/thirdparty/libopenui/src/window.cpp

@@ -369,21 +369,25 @@ FormLine *Window::newLine(FlexGridLayout &layout)
 
 void Window::show(bool visible)
 {
-  if (lv_obj_has_flag(lvobj, LV_OBJ_FLAG_HIDDEN) == visible) {
-    if (visible)
-      lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
-    else
-      lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
+  if (!_deleted && lvobj) {
+    if (lv_obj_has_flag(lvobj, LV_OBJ_FLAG_HIDDEN) == visible) {
+      if (visible)
+        lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
+      else
+        lv_obj_add_flag(lvobj, LV_OBJ_FLAG_HIDDEN);
+    }
   }
 }
 
 void Window::enable(bool enabled)
 {
-  if (lv_obj_has_state(lvobj, LV_STATE_DISABLED) == enabled) {
-    if (enabled)
-      lv_obj_clear_state(lvobj, LV_STATE_DISABLED);
-    else
-      lv_obj_add_state(lvobj, LV_STATE_DISABLED);
+  if (!_deleted && lvobj) {
+    if (lv_obj_has_state(lvobj, LV_STATE_DISABLED) == enabled) {
+      if (enabled)
+        lv_obj_clear_state(lvobj, LV_STATE_DISABLED);
+      else
+        lv_obj_add_state(lvobj, LV_STATE_DISABLED);
+    }
   }
 }