test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 03:58:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

improve canvas clip rect

Browse Source
This commit is contained in:
xianjimli 2020-02-23 12:08:48 +08:00
parent 2805599d82
commit 2456be86b6
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.md
View File

@ -2,6 +2,7 @@
* 2020/02/23
* 用SDL重新实现PC版本的线程和同步相关函数。
* 完善canvas裁剪区域（感谢智明提供补丁）。
* 2020/02/21
* 处理 jpeg 文件扩展名（感谢朝泽提供补丁）。

17
src/base/canvas.c
View File

@ -171,20 +171,31 @@ ret_t canvas_set_clip_rect(canvas_t* c, const rect_t* r_in) {
}
if (c->lcd->set_clip_rect != NULL) {
#ifdef WITH_NANOVG_GPU
/* 在 opengl 的状态下让 vg 来处理裁剪区的大小直接交给 vg 来处理，去除 LCD 的大小限制的问题 */
if (r) {
rect_t clip_r = rect_init(tk_max(0, r->x), tk_max(0, r->y), tk_max(0, lcd_w), tk_max(0, lcd_h));
lcd_set_clip_rect(c->lcd, &clip_r);
} else {
rect_t clip_r = rect_init(0, 0, lcd_w, lcd_h);
lcd_set_clip_rect(c->lcd, &clip_r);
}
#else
xy_t x = c->clip_left;
xy_t y = c->clip_top;
wh_t w = c->clip_right - c->clip_left + 1;
wh_t h = c->clip_bottom - c->clip_top + 1;
rect_t clip_r = rect_init(x, y, w, h);
lcd_set_clip_rect(c->lcd, &clip_r);
#endif
}
#ifdef WITH_NANOVG_GPU
/* 把 canvas 的裁剪区设置为全屏，在 opengl 的状态下让 vg 来处理裁剪区的问题 */
/* 把 canvas 的裁剪区设置为无限大，在 opengl 的状态下让 vg 来处理裁剪区的问题 */
c->clip_left = 0;
c->clip_top = 0;
c->clip_right = lcd_w - 1;
c->clip_bottom = lcd_h - 1;
c->clip_right = 0x7fffffff;
c->clip_bottom = 0x7fffffff;
#endif
return RET_OK;