merge change
This commit is contained in:
@@ -96,15 +96,25 @@ void lv_inv_area(const lv_area_t * area_p)
|
||||
suc = lv_area_union(&com_area, area_p, &scr_area);
|
||||
|
||||
/*The area is truncated to the screen*/
|
||||
if(suc != false)
|
||||
{
|
||||
if(suc != false) {
|
||||
#if LV_INV_FULL_ROW == 1
|
||||
/*Extend invalid area to be as wide as the screen*/
|
||||
com_area.x1 = 0;
|
||||
com_area.x2 = LV_HOR_RES-1;
|
||||
#endif
|
||||
|
||||
#if LV_INV_FULL_COL == 1
|
||||
/*Extend invalid area to be as tall as the screen*/
|
||||
com_area.y1 = 0;
|
||||
com_area.y2 = LV_VER_RES-1;
|
||||
#endif
|
||||
|
||||
/*Save only if this area is not in one of the saved areas*/
|
||||
uint16_t i;
|
||||
for(i = 0; i < inv_buf_p; i++) {
|
||||
if(lv_area_is_in(&com_area, &inv_buf[i].area) != false) return;
|
||||
}
|
||||
|
||||
|
||||
/*Save the area*/
|
||||
if(inv_buf_p < LV_INV_FIFO_SIZE) {
|
||||
lv_area_copy(&inv_buf[inv_buf_p].area,&com_area);
|
||||
|
||||
Reference in New Issue
Block a user