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

improve ffr_draw_rounded_rect

Browse Source
This commit is contained in:
lixianjing 2021-06-17 10:55:42 +08:00
parent 7e5653ba06
commit 70a389c7d5
3 changed files with 335 additions and 608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.md
View File

@ -4,6 +4,7 @@
* 完善awtk\_main.inc（感谢朝泽提供补丁）
* 修改控件动画的刷新时间和最高帧率绑定一起（感谢智明提供补丁）
* 增加lcd的接口并且完善其他的类型lcd的接口（感谢智明提供补丁）
* 修复圆角矩形依赖宏来判断lcd类型来打点的问题（感谢智明提供补丁）
2021/06/16
* 支持[极简键盘 (3 键键盘、5 键键盘和旋转按钮）](docs/how_to_support_5keys_3keys.md)

885
src/base/ffr_draw_rounded_rect.inc
View File

File diff suppressed because it is too large Load Diff

57
tests/lcd_test.cc Normal file
View File

@ -0,0 +1,57 @@
#include "base/lcd.h"
#include "tkc/utils.h"
#include "gtest/gtest.h"
static rect_t s_dirty_rect;
static int32_t s_canvas_ptr = 0;
static uint32_t s_line_length = 0;
static ret_t lcd_log_set_line_length(lcd_t* lcd, uint32_t line_length) {
s_line_length = line_length;
return RET_OK;
}
static ret_t lcd_log_set_canvas(lcd_t* lcd, canvas_t* c) {
s_canvas_ptr = tk_pointer_to_int(c);
return RET_OK;
}
static ret_t lcd_log_begin_frame(lcd_t* lcd, const rect_t* dirty_rect) {
s_dirty_rect.x = dirty_rect->x;
s_dirty_rect.y = dirty_rect->y;
s_dirty_rect.w = dirty_rect->w;
s_dirty_rect.h = dirty_rect->h;
return RET_OK;
}
TEST(lcd, base) {
rect_t r;
rect_t r1;
lcd_t lcd;
memset(&lcd, 0x0, sizeof(lcd_t));
r = rect_init(100, 100, 200, 200);
lcd.w = 800;
lcd.h = 480;
lcd.type = LCD_COMPOSITOR;
lcd.set_canvas = lcd_log_set_canvas;
lcd.begin_frame = lcd_log_begin_frame;
lcd.set_line_length = lcd_log_set_line_length;
ASSERT_EQ(lcd_is_compositor(&lcd) == TRUE, true);
ASSERT_EQ(lcd_get_curr_lcd_type(&lcd) == LCD_COMPOSITOR, true);
ASSERT_EQ(lcd_set_line_length(&lcd, 100), RET_OK);
ASSERT_EQ(s_line_length, 100);
ASSERT_EQ(lcd_set_canvas(&lcd, (canvas_t*)tk_pointer_from_int(0xee)), RET_OK);
ASSERT_EQ(s_canvas_ptr, 0xee);
ASSERT_EQ(lcd_begin_frame(&lcd, &r, LCD_DRAW_OFFLINE), RET_OK);
ASSERT_EQ(lcd_get_dirty_rect(&lcd, &r1), RET_OK);
ASSERT_EQ(s_dirty_rect.x, r1.x);
ASSERT_EQ(s_dirty_rect.y, r1.y);
ASSERT_EQ(s_dirty_rect.w, r1.w);
ASSERT_EQ(s_dirty_rect.h, r1.h);
}