github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor grid fix

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-09-08 10:08:19 +02:00
parent 8b969fab61
commit f002f6a722
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/lv_core/lv_obj.c
View File

@@ -727,7 +727,6 @@ void lv_obj_clear_flag(lv_obj_t * obj, lv_obj_flag_t f)
obj->flags &= (~f); obj->flags &= (~f);
} }
/** /**
* Set the state (fully overwrite) of an object. * Set the state (fully overwrite) of an object.
* If specified in the styles a transition animation will be started * If specified in the styles a transition animation will be started

18
src/lv_core/lv_obj_pos.c
View File

@@ -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 not grid item but has grid position set the position to 0*/
// if(!gi) { if(!gi) {
// if(_GRID_IS_CELL(x)) { if(_GRID_IS_CELL(x)) {
// obj->x_set = 0; x = 0;
// x = 0; }
// } if(_GRID_IS_CELL(y)) {
// if(_GRID_IS_CELL(y)) { y = 0;
// obj->y_set = 0; }
// y = 0; }
// }
// }
/*If the object is on a grid item let the grid to position it. */ /*If the object is on a grid item let the grid to position it. */
if(gi) { if(gi) {