diff --git a/src/lv_core/lv_obj.c b/src/lv_core/lv_obj.c index 3ce1e7951..43228435b 100644 --- a/src/lv_core/lv_obj.c +++ b/src/lv_core/lv_obj.c @@ -727,7 +727,6 @@ void lv_obj_clear_flag(lv_obj_t * obj, lv_obj_flag_t f) obj->flags &= (~f); } - /** * Set the state (fully overwrite) of an object. * If specified in the styles a transition animation will be started diff --git a/src/lv_core/lv_obj_pos.c b/src/lv_core/lv_obj_pos.c index 247cb108e..b4895ade6 100644 --- a/src/lv_core/lv_obj_pos.c +++ b/src/lv_core/lv_obj_pos.c @@ -62,16 +62,14 @@ void lv_obj_set_pos(lv_obj_t * obj, lv_coord_t x, lv_coord_t y) } /*If not grid item but has grid position set the position to 0*/ -// if(!gi) { -// if(_GRID_IS_CELL(x)) { -// obj->x_set = 0; -// x = 0; -// } -// if(_GRID_IS_CELL(y)) { -// obj->y_set = 0; -// y = 0; -// } -// } + if(!gi) { + if(_GRID_IS_CELL(x)) { + x = 0; + } + if(_GRID_IS_CELL(y)) { + y = 0; + } + } /*If the object is on a grid item let the grid to position it. */ if(gi) {