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

fix(area): lv_area_diff remove overlap (#7696)

Browse Source
This commit is contained in:
Liam Howatt
2025-02-06 07:28:01 -05:00
committed by GitHub
parent f9a9d5b41b
commit 236c7ad625
2 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
tests/src/test_cases/test_area.c
View File

@@ -119,4 +119,73 @@ void test_pct(void)
TEST_ASSERT_EQUAL_INT32(-PCT_MAX_VALUE, LV_COORD_GET_PCT(pct_coord));
}
void test_area_diff(void)
{
lv_area_t expected[4] = {
{0, 0, 100, 29}, /* wide top rectangle */
{0, 91, 100, 100}, /* wide bottom rectangle */
{0, 30, 39, 90}, /* left rectangle */
{81, 30, 100, 90} /* right rectangle */
};
lv_area_t outer = {0, 0, 100, 100};
lv_area_t remove = {40, 30, 80, 90};
lv_area_t actual[4];
lv_memset(actual, 0, sizeof(actual));
int8_t area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 4);
TEST_PRINTF("%d %d %d %d", actual[0].x1, actual[0].y1, actual[0].x2, actual[0].y2);
TEST_ASSERT_TRUE(lv_area_is_equal(&expected[0], &actual[0]));
TEST_PRINTF("%d %d %d %d", actual[1].x1, actual[1].y1, actual[1].x2, actual[1].y2);
TEST_ASSERT_TRUE(lv_area_is_equal(&expected[1], &actual[1]));
TEST_PRINTF("%d %d %d %d", actual[2].x1, actual[2].y1, actual[2].x2, actual[2].y2);
TEST_ASSERT_TRUE(lv_area_is_equal(&expected[2], &actual[2]));
TEST_PRINTF("%d %d %d %d", actual[3].x1, actual[3].y1, actual[3].x2, actual[3].y2);
TEST_ASSERT_TRUE(lv_area_is_equal(&expected[3], &actual[3]));
/* no left edge */
lv_area_set(&remove, 0, 10, 10, 20);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 3);
lv_area_set(&remove, 1, 10, 10, 20);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 4);
/* no right edge */
lv_area_set(&remove, 90, 10, 100, 20);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 3);
lv_area_set(&remove, 90, 10, 99, 20);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 4);
/* no top edge */
lv_area_set(&remove, 10, 0, 20, 20);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 3);
lv_area_set(&remove, 10, 1, 20, 20);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 4);
/* no bottom edge */
lv_area_set(&remove, 10, 90, 20, 100);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 3);
lv_area_set(&remove, 10, 90, 20, 99);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 4);
/* top and left edges missing */
lv_area_set(&remove, -50, -50, 50, 50);
area_count = lv_area_diff(actual, &outer, &remove);
TEST_ASSERT_EQUAL_INT8(area_count, 2);
}
#endif