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

format code

Browse Source
This commit is contained in:
xianjimli 2020-09-17 09:09:37 +08:00
parent 215927a463
commit 84c53f90e5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/base/canvas.c
View File

@ -1953,7 +1953,8 @@ ret_t canvas_fill_rounded_rect_ex(canvas_t* c, const rect_t* r, const rect_t* bg
ret_t canvas_stroke_rounded_rect_ex(canvas_t* c, const rect_t* r, const rect_t* bg_r,
const color_t* color, uint32_t radius_tl, uint32_t radius_tr,
uint32_t radius_bl, uint32_t radius_br, uint32_t border_width, int32_t border_model) {
uint32_t radius_bl, uint32_t radius_br, uint32_t border_width,
int32_t border_model) {
return ffr_draw_stroke_rounded_rect_ex(c, r, bg_r, color, radius_tl, radius_tr, radius_bl,
radius_br, border_width, border_model);
}

3
src/base/canvas.h
View File

@ -814,7 +814,8 @@ ret_t canvas_stroke_rounded_rect(canvas_t* c, const rect_t* r, const rect_t* bg_
*/
ret_t canvas_stroke_rounded_rect_ex(canvas_t* c, const rect_t* r, const rect_t* bg_r,
const color_t* color, uint32_t radius_tl, uint32_t radius_tr,
uint32_t radius_bl, uint32_t radius_br, uint32_t border_width, int32_t border_model);
uint32_t radius_bl, uint32_t radius_br, uint32_t border_width,
int32_t border_model);
/**
* @method canvas_end_frame

4
src/base/widget.c
View File

@ -1413,8 +1413,8 @@ ret_t widget_stroke_border_rect(widget_t* widget, canvas_t* c, rect_t* r) {
if (bd.rgba.a) {
canvas_set_stroke_color(c, bd);
if (radius_tl > 3 || radius_tr > 3 || radius_bl > 3 || radius_br > 3) {
if (canvas_stroke_rounded_rect_ex(c, r, NULL, &bd, radius_tl, radius_tr, radius_bl,
radius_br, border_width, border) != RET_OK) {
if (canvas_stroke_rounded_rect_ex(c, r, NULL, &bd, radius_tl, radius_tr, radius_bl, radius_br,
border_width, border) != RET_OK) {
widget_stroke_border_rect_for_border_type(c, r, bd, border, border_width);
}
} else {