test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-11-30 19:18:53 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/xianjimli/lftk

Browse Source
This commit is contained in:
xianjimli 2018-04-17 15:10:34 +08:00
commit b8372edbca
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/base/canvas.c
View File

@ -672,6 +672,7 @@ ret_t canvas_draw_image_3patch_y(canvas_t* c, bitmap_t* img, rect_t* dst) {
canvas_draw_image(c, img, &s, &d); canvas_draw_image(c, img, &s, &d);
canvas_untranslate(c, dst->x, dst->y); canvas_untranslate(c, dst->x, dst->y);
(void)dst_w;
return RET_OK; return RET_OK;
} }
@ -845,6 +846,10 @@ ret_t canvas_draw_image_9patch(canvas_t* c, bitmap_t* img, rect_t* dst) {
canvas_untranslate(c, dst->x, dst->y); canvas_untranslate(c, dst->x, dst->y);
(void)x;
(void)y;
(void)dst_w;
return RET_OK; return RET_OK;
} }

4
src/base/lcd.c
View File

@ -1,4 +1,4 @@
/** /**
* File: lcd.c * File: lcd.c
* Author: Li XianJing <xianjimli@hotmail.com> * Author: Li XianJing <xianjimli@hotmail.com>
* Brief: lcd interface * Brief: lcd interface
@ -161,7 +161,7 @@ wh_t lcd_measure_text(lcd_t* lcd, wchar_t* str, int32_t nr) {
} }
ret_t lcd_draw_text(lcd_t* lcd, wchar_t* str, int32_t nr, xy_t x, xy_t y) { ret_t lcd_draw_text(lcd_t* lcd, wchar_t* str, int32_t nr, xy_t x, xy_t y) {
return_value_if_fail(lcd != NULL && lcd->draw_text != NULL && str != NULL, 0); return_value_if_fail(lcd != NULL && lcd->draw_text != NULL && str != NULL, RET_OK);
return lcd->draw_text(lcd, str, nr, x, y); return lcd->draw_text(lcd, str, nr, x, y);
} }