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

refactor clip view

Browse Source
This commit is contained in:
lixianjing 2021-06-11 08:40:32 +08:00
parent b7b8564709
commit 51ff5bb7c2
2 changed files with 7 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/changes.md
View File

@ -1,5 +1,11 @@
# 最新动态
2021/06/11
* 完善焦点处理。
* pages支持clip。
* 完善edit对自动测试的支持。
* 重构clip view，将clip函数抽取出来方便重用。
2021/06/10
* 完善编辑器对左右键的处理。
* 修复vpage中注释的问题(感谢朝泽提供补丁)

38
src/widgets/clip_view.c
View File

@ -23,47 +23,11 @@
#include "widgets/clip_view.h"
#include "base/widget_vtable.h"
static ret_t clip_view_on_paint_children(widget_t* widget, canvas_t* c) {
rect_t r = {0};
rect_t r_save = {0};
rect_t r_vg_save = {0};
clip_view_t* clip_view = CLIP_VIEW(widget);
vgcanvas_t* vg = canvas_get_vgcanvas(c);
return_value_if_fail(clip_view != NULL, RET_BAD_PARAMS);
/* 裁剪子控件的话，需要注意保存和还原 canvas 和 vg 这两个画布，*/
/* 因为子控件可能会修改任意一个画布的裁剪区或者其他的配置，有概率会导致其他的控件的绘图不正常 */
/* 如果创建新的裁剪区的话，需要和之前的裁剪区做交集，让新的裁剪区必须在旧的裁剪区中 */
canvas_save(c);
canvas_get_clip_rect(c, &r_save);
if (vg != NULL) {
vgcanvas_save(vg);
r_vg_save = rect_init(vg->clip_rect.x, vg->clip_rect.y, vg->clip_rect.w, vg->clip_rect.h);
}
r = rect_init(c->ox, c->oy, widget->w, widget->h);
r = rect_intersect(&r, &r_save);
canvas_set_clip_rect(c, &r);
if (vg != NULL) {
vgcanvas_clip_rect(vg, r.x, r.y, r.w, r.h);
}
widget_on_paint_children_default(widget, c);
if (vg != NULL) {
vgcanvas_clip_rect(vg, r_vg_save.x, r_vg_save.y, r_vg_save.w, r_vg_save.h);
vgcanvas_restore(vg);
}
canvas_set_clip_rect(c, &r_save);
canvas_restore(c);
return RET_OK;
}
TK_DECL_VTABLE(clip_view) = {.size = sizeof(clip_view_t),
.type = WIDGET_TYPE_CLIP_VIEW,
.parent = TK_PARENT_VTABLE(widget),
.create = clip_view_create,
.on_paint_children = clip_view_on_paint_children};
.on_paint_children = widget_on_paint_children_clip};
widget_t* clip_view_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h) {
return widget_create(parent, TK_REF_VTABLE(clip_view), x, y, w, h);