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

revert(style) revert the usage of transform width/height

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-04-18 20:28:06 +02:00
parent 32bd067778
commit 6db12e4997
17 changed files with 127 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/lv_obj_pos.c
View File

@@ -116,8 +116,6 @@ void lv_obj_refr_size(lv_obj_t * obj)
lv_coord_t parent_w = lv_obj_get_width_fit(parent);
if(pct_w) w = (LV_COORD_GET_PCT(w) * parent_w) / 100;
w += lv_obj_get_style_transform_width(obj, LV_PART_MAIN);
lv_coord_t minw = lv_obj_get_style_min_width(obj, LV_PART_MAIN);
lv_coord_t maxw = lv_obj_get_style_max_width(obj, LV_PART_MAIN);
w = lv_clamp_width(w, minw, maxw, parent_w);
@@ -143,8 +141,6 @@ void lv_obj_refr_size(lv_obj_t * obj)
lv_coord_t parent_h = lv_obj_get_height_fit(parent);
if(pct_h) h = (LV_COORD_GET_PCT(h) * parent_h) / 100;
h += lv_obj_get_style_transform_height(obj, LV_PART_MAIN);
lv_coord_t minh = lv_obj_get_style_min_height(obj, LV_PART_MAIN);
lv_coord_t maxh = lv_obj_get_style_max_height(obj, LV_PART_MAIN);
h = lv_clamp_width(h, minh, maxh, parent_h);