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

Revert "feat(style) make transform_zoom use pixel or percentage value"

Browse Source 
This reverts commit 5b4e9fc6f3.
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-18 19:31:38 +02:00
parent 5b4e9fc6f3
commit 32bd067778
6 changed files with 59 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/lv_obj_pos.c
View File

@@ -609,12 +609,8 @@ void lv_obj_refr_pos(lv_obj_t * obj)
if(lv_obj_is_layout_positioned(obj)) return;
lv_obj_t * parent = lv_obj_get_parent(obj);
lv_coord_t tr_x = lv_obj_get_style_transform_x(obj, LV_PART_MAIN);
lv_coord_t tr_y = lv_obj_get_style_transform_y(obj, LV_PART_MAIN);
if(LV_COORD_IS_PCT(tr_x)) tr_x = (lv_obj_get_width(obj) * LV_COORD_GET_PCT(tr_x)) / 100;
if(LV_COORD_IS_PCT(tr_y)) tr_y = (lv_obj_get_height(obj) * LV_COORD_GET_PCT(tr_y)) / 100;
lv_coord_t x = lv_obj_get_style_x(obj, LV_PART_MAIN) + tr_x;
lv_coord_t y = lv_obj_get_style_y(obj, LV_PART_MAIN) + tr_y;
lv_coord_t x = lv_obj_get_style_x(obj, LV_PART_MAIN) + lv_obj_get_style_transform_x(obj, LV_PART_MAIN);
lv_coord_t y = lv_obj_get_style_y(obj, LV_PART_MAIN) + lv_obj_get_style_transform_y(obj, LV_PART_MAIN);
if(parent == NULL) {
lv_obj_move_to(obj, x, y);
return;