minor fixes

Author: kisvegabor

lv_core/lv_indev.c

@@ -212,6 +212,12 @@ bool lv_indev_is_dragging(const lv_indev_t * indev)
  */
 void lv_indev_get_vect(const lv_indev_t * indev, lv_point_t * point)
 {
+    if(indev == NULL) {
+        point->x = 0;
+        point->y = 0;
+        return;
+    }
+
     if(indev->driver.type != LV_INDEV_TYPE_POINTER && indev->driver.type != LV_INDEV_TYPE_BUTTON) {
         point->x = 0;
         point->y = 0;
@@ -461,11 +467,15 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
             if(focused) focused->signal_func(focused, LV_SIGNAL_GET_EDITABLE, &editable);
 
             if(editable) {
-                lv_group_set_editing(i->group, lv_group_get_editing(i->group) ? false : true);  /*Toggle edit mode on long press*/
+                if(i->group->obj_ll.head != i->group->obj_ll.tail)
+                    lv_group_set_editing(i->group, lv_group_get_editing(i->group) ? false : true);  /*Toggle edit mode on long press*/
+                else if(focused)
+                    focused->signal_func(focused, LV_SIGNAL_LONG_PRESS, indev_act);
             }
             /*If not editable then just send a long press signal*/
             else {
-                if(focused) focused->signal_func(focused, LV_SIGNAL_LONG_PRESS, indev_act);
+                if(focused)
+                    focused->signal_func(focused, LV_SIGNAL_LONG_PRESS, indev_act);
             }
             i->proc.long_pr_sent = 1;
         }
@@ -482,7 +492,8 @@ static void indev_encoder_proc(lv_indev_t * i, lv_indev_data_t * data)
         }
         /*An object is being edited and the button is releases. Just send enter */
         else if(i->group->editing) {
-            if(!i->proc.long_pr_sent) lv_group_send_data(i->group, LV_GROUP_KEY_ENTER);  /*Ignore long pressed enter release because it comes from mode switch*/
+            if(!i->proc.long_pr_sent || i->group->obj_ll.head == i->group->obj_ll.tail)
+                lv_group_send_data(i->group, LV_GROUP_KEY_ENTER);  /*Ignore long pressed enter release because it comes from mode switch*/
         }
         /*If the focused object is editable and now in navigate mode then enter edit mode*/
         else if(editable && !i->group->editing && !i->proc.long_pr_sent) {
@@ -574,7 +585,10 @@ static void indev_proc_press(lv_indev_proc_t * proc)
             if(proc->reset_query != 0) return;
         }
 
-        if(pr_obj != NULL) {
+        proc->act_obj = pr_obj;           /*Save the pressed object*/
+        proc->last_obj = proc->act_obj;   /*Refresh the last_obj*/
+
+        if(proc->act_obj != NULL) {
             /* Save the time when the obj pressed.
              * It is necessary to count the long press time.*/
             proc->pr_timestamp = lv_tick_get();
@@ -583,9 +597,11 @@ static void indev_proc_press(lv_indev_proc_t * proc)
             proc->drag_in_prog = 0;
             proc->drag_sum.x = 0;
             proc->drag_sum.y = 0;
+            proc->vect.x = 0;
+            proc->vect.y = 0;
 
             /*Search for 'top' attribute*/
-            lv_obj_t * i = pr_obj;
+            lv_obj_t * i = proc->act_obj;
             lv_obj_t * last_top = NULL;
             while(i != NULL) {
                 if(i->top != 0) last_top = i;
@@ -601,14 +617,11 @@ static void indev_proc_press(lv_indev_proc_t * proc)
             }
 
             /*Send a signal about the press*/
-            pr_obj->signal_func(pr_obj, LV_SIGNAL_PRESSED, indev_act);
+            proc->act_obj->signal_func(proc->act_obj, LV_SIGNAL_PRESSED, indev_act);
             if(proc->reset_query != 0) return;
         }
     }
 
-    proc->act_obj = pr_obj;            /*Save the pressed object*/
-    proc->last_obj = proc->act_obj;   /*Refresh the last_obj*/
-
     /*Calculate the vector*/
     proc->vect.x = proc->act_point.x - proc->last_point.x;
     proc->vect.y = proc->act_point.y - proc->last_point.y;
@@ -885,14 +898,19 @@ static void indev_drag_throw(lv_indev_proc_t * state)
 
     if(state->vect.x != 0 ||
             state->vect.y != 0) {
-        /*Get the coordinates  and modify them*/
+        /*Get the coordinates and modify them*/
+        lv_area_t coords_ori;
+        lv_obj_get_coords(drag_obj, &coords_ori);
         lv_coord_t act_x = lv_obj_get_x(drag_obj) + state->vect.x;
         lv_coord_t act_y = lv_obj_get_y(drag_obj) + state->vect.y;
         lv_obj_set_pos(drag_obj, act_x, act_y);
 
+        lv_area_t coord_new;
+        lv_obj_get_coords(drag_obj, &coord_new);
+
         /*If non of the coordinates are changed then do not continue throwing*/
-        if((lv_obj_get_x(drag_obj) != act_x || state->vect.x == 0) &&
-                (lv_obj_get_y(drag_obj) != act_y || state->vect.y == 0)) {
+        if((coords_ori.x1 == coord_new.x1 || state->vect.x == 0) &&
+                (coords_ori.y1 == coord_new.y1 || state->vect.y == 0)) {
             state->drag_in_prog = 0;
             state->vect.x = 0;
             state->vect.y = 0;

lv_core/lv_obj.c

@@ -360,10 +360,13 @@ lv_res_t lv_obj_del(lv_obj_t * obj)
 void lv_obj_clean(lv_obj_t * obj)
 {
     lv_obj_t * child = lv_obj_get_child(obj, NULL);
-
+    lv_obj_t * child_next;
     while(child) {
+        /* Read the next child before deleting the current
+         * because the next couldn't be read from a deleted (invalid) node*/
+        child_next = lv_obj_get_child(obj, child);
         lv_obj_del(child);
-        child = lv_obj_get_child(obj, child);
+        child = child_next;
     }
 }