zlgopen/awtk
1
0
Fork 0
mirror of https://github.com/zlgopen/awtk.git synced 2025-05-09 03:51:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

format code

Browse Source
This commit is contained in:
lixianjing 2022-03-29 11:58:46 +08:00
parent 27669a87d4
commit 3caa331c68
11 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/base/text_edit.c
View File

@ -1159,7 +1159,7 @@ static ret_t text_edit_update_caret_pos(text_edit_t* text_edit) {
for (i = 0; i < rows->size; i++) {
row_info_t* row = rows->row + i;
for (j = 0; j < row->line_num; j++, y+=line_height, line_index++) {
for (j = 0; j < row->line_num; j++, y += line_height, line_index++) {
line_info_t* line = (line_info_t*)darray_get(&row->info, j);
uint32_t line_offset_begin = line->offset;
uint32_t line_offset_end = line->offset + line->length;
@ -1402,7 +1402,7 @@ ret_t text_edit_key_down(text_edit_t* text_edit, key_event_t* evt) {
state->cursor = text->size;
stb_textedit_key(text_edit, state, STB_TEXTEDIT_K_LINEEND);
}
goto layout;
goto layout;
return RET_OK;
}

7
src/base/widget.c
View File

@ -3581,7 +3581,9 @@ int32_t widget_index_of(widget_t* widget) {
return -1;
}
ret_t widget_prepare_text_style_ex(widget_t* widget, canvas_t* c, color_t default_trans, const char* default_font, uint16_t default_font_size, align_h_t default_align_h, align_v_t default_align_v) {
ret_t widget_prepare_text_style_ex(widget_t* widget, canvas_t* c, color_t default_trans,
const char* default_font, uint16_t default_font_size,
align_h_t default_align_h, align_v_t default_align_v) {
style_t* style = widget->astyle;
color_t tc = style_get_color(style, STYLE_ID_TEXT_COLOR, default_trans);
const char* font_name = style_get_str(style, STYLE_ID_FONT_NAME, default_font);
@ -3598,7 +3600,8 @@ ret_t widget_prepare_text_style_ex(widget_t* widget, canvas_t* c, color_t defaul
ret_t widget_prepare_text_style(widget_t* widget, canvas_t* c) {
color_t trans = color_init(0, 0, 0, 0);
return widget_prepare_text_style_ex(widget, c, trans, NULL, TK_DEFAULT_FONT_SIZE, ALIGN_H_CENTER, ALIGN_V_MIDDLE);
return widget_prepare_text_style_ex(widget, c, trans, NULL, TK_DEFAULT_FONT_SIZE, ALIGN_H_CENTER,
ALIGN_V_MIDDLE);
}
static ret_t widget_copy_style(widget_t* clone, widget_t* widget) {

4
src/base/widget.h
View File

@ -2494,7 +2494,9 @@ ret_t widget_prepare_text_style(widget_t* widget, canvas_t* c);
*
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t widget_prepare_text_style_ex(widget_t* widget, canvas_t* c, color_t default_trans, const char* default_font, uint16_t default_font_size, align_h_t default_align_h, align_v_t default_align_v);
ret_t widget_prepare_text_style_ex(widget_t* widget, canvas_t* c, color_t default_trans,
const char* default_font, uint16_t default_font_size,
align_h_t default_align_h, align_v_t default_align_v);
/**
* @method widget_measure_text

3
src/ext_widgets/mledit/line_number.c
View File

@ -53,7 +53,8 @@ static ret_t line_number_do_paint_self(widget_t* widget, canvas_t* c) {
if (style_is_valid(widget->astyle)) {
uint32_t line_index = 0;
color_t trans = color_init(0, 0, 0, 0);
widget_prepare_text_style_ex(widget, c, trans, NULL, TK_DEFAULT_FONT_SIZE, ALIGN_H_RIGHT, ALIGN_V_TOP);
widget_prepare_text_style_ex(widget, c, trans, NULL, TK_DEFAULT_FONT_SIZE, ALIGN_H_RIGHT,
ALIGN_V_TOP);
color_t active_bg =
style_get_color(widget->astyle, LINE_NUMBER_STYLE_ACTIVE_LINE_BG_COLOR, trans);
color_t highlight_bg =

2
src/fscript_ext/fscript_bits.c
View File

@ -421,7 +421,7 @@ static ret_t func_bit_nor(fscript_t* fscript, fscript_args_t* args, value_t* res
static ret_t func_bit_not(fscript_t* fscript, fscript_args_t* args, value_t* result) {
FSCRIPT_FUNC_CHECK(args->size == 1, RET_BAD_PARAMS);
switch(args->args->type) {
switch (args->args->type) {
case VALUE_TYPE_INT8:
case VALUE_TYPE_UINT8: {
value_set_uint8(result, ~value_uint8(args->args));

1
src/platforms/aworkslp/fs_aworks.c
View File

@ -42,7 +42,6 @@
#define tk_log_info_htlf(header, fmt, args...) tk_log_info_lf(fmt, ##args)
#endif
#if CONFIG_HC32F4A0_CATNET_BOARD || CONFIG_M105X_EV_BOARD_LP
#define TKC_FS_EXE_PATH "/lfs/bin/app/"
#define TKC_FS_TEMP_PATH "/lfs/tmp/"

13
src/platforms/aworkslp/serial_helper.c
View File

@ -233,8 +233,7 @@ ret_t serial_config(serial_handle_t handle, uint32_t baudrate, bytesize_t bytesi
return RET_OK;
}
ret_t serial_timeout_set(serial_handle_t handle, serial_timeout_t *timeout) {
ret_t serial_timeout_set(serial_handle_t handle, serial_timeout_t* timeout) {
int fd = serial_handle_get_fd(handle);
struct aw_serial_timeout cfg;
return_value_if_fail(fd >= 0 && timeout, RET_BAD_PARAMS);
@ -244,7 +243,7 @@ ret_t serial_timeout_set(serial_handle_t handle, serial_timeout_t *timeout) {
return_value_if_fail(aw_serial_timeout_set(fd, &cfg) == AW_OK, RET_FAIL);
}
ret_t serial_timeout_get(serial_handle_t handle, serial_timeout_t *timeout) {
ret_t serial_timeout_get(serial_handle_t handle, serial_timeout_t* timeout) {
int fd = serial_handle_get_fd(handle);
struct aw_serial_timeout cfg;
return_value_if_fail(fd >= 0 && timeout, RET_BAD_PARAMS);
@ -423,7 +422,7 @@ ret_t serial_config(serial_handle_t handle, uint32_t baudrate, bytesize_t bytesi
return RET_OK;
}
ret_t serial_timeout_set(serial_handle_t handle, serial_timeout_t *timeout) {
ret_t serial_timeout_set(serial_handle_t handle, serial_timeout_t* timeout) {
int fd = serial_handle_get_fd(handle);
struct aw_serial_timeout cfg;
return_value_if_fail(fd >= 0 && timeout, RET_BAD_PARAMS);
@ -433,7 +432,7 @@ ret_t serial_timeout_set(serial_handle_t handle, serial_timeout_t *timeout) {
return_value_if_fail(aw_serial_timeout_set(fd, &cfg) == AW_OK, RET_FAIL);
}
ret_t serial_timeout_get(serial_handle_t handle, serial_timeout_t *timeout) {
ret_t serial_timeout_get(serial_handle_t handle, serial_timeout_t* timeout) {
int fd = serial_handle_get_fd(handle);
struct aw_serial_timeout cfg;
return_value_if_fail(fd >= 0 && timeout, RET_BAD_PARAMS);
@ -537,11 +536,11 @@ ret_t serial_config(serial_handle_t handle, uint32_t baudrate, bytesize_t bytesi
return aw_ioctl(fd, AW_TIOSETOPTIONS, &dcb);
}
ret_t serial_timeout_set(serial_handle_t handle, serial_timeout_t *timeout) {
ret_t serial_timeout_set(serial_handle_t handle, serial_timeout_t* timeout) {
return RET_NOT_IMPL;
}
ret_t serial_timeout_get(serial_handle_t handle, serial_timeout_t *timeout) {
ret_t serial_timeout_get(serial_handle_t handle, serial_timeout_t* timeout) {
return RET_NOT_IMPL;
}

4
src/platforms/aworkslp/thread.c
View File

@ -133,7 +133,9 @@ void* tk_thread_get_args(tk_thread_t* thread) {
}
ret_t tk_thread_destroy(tk_thread_t* thread) {
return_value_if_fail(thread != NULL && thread->id != AW_TASK_ID_INVALID && thread->running == FALSE, RET_BAD_PARAMS);
return_value_if_fail(
thread != NULL && thread->id != AW_TASK_ID_INVALID && thread->running == FALSE,
RET_BAD_PARAMS);
thread->id = AW_TASK_ID_INVALID;
memset(thread, 0x00, sizeof(tk_thread_t));

1
src/tkc/value.c
View File

@ -918,4 +918,3 @@ value_t* value_set_func(value_t* v, void* value) {
return value_init(v, VALUE_TYPE_FUNC);
}

7
tests/fscript_test.cc
View File

@ -1335,8 +1335,8 @@ TEST(FExr, repeat_statement14) {
value_t v;
tk_object_t* obj = object_default_create();
fscript_eval(obj,
"var s = 0;\
fscript_eval(obj,
"var s = 0;\
var i = 0;\
repeat(i, 0, 100, 1) {;\
s = s + i;\
@ -1345,7 +1345,8 @@ repeat(a, 0, 100, 1) {\
s = s + a;\
}\
print(s)\
s", &v);
s",
&v);
ASSERT_EQ(value_int(&v), 9900);
value_reset(&v);

12
tests/object_date_time_test.cc
View File

@ -12,7 +12,7 @@ static ret_t visit_dump(void* ctx, const void* data) {
string& str = *(string*)ctx;
const named_value_t* nv = (named_value_t*)data;
str += nv->name + string(":") + value_str_ex(&(nv->value), buff, sizeof(buff)-1);
str += nv->name + string(":") + value_str_ex(&(nv->value), buff, sizeof(buff) - 1);
return RET_OK;
}
@ -26,19 +26,19 @@ TEST(ObjectDateTime, basic) {
ASSERT_EQ(tk_object_set_prop_uint32(obj, OBJECT_DATE_TIME_PROP_MONTH, 3), RET_OK);
ASSERT_EQ(tk_object_get_prop_uint32(obj, OBJECT_DATE_TIME_PROP_MONTH, 0), 3);
ASSERT_EQ(tk_object_set_prop_uint32(obj, OBJECT_DATE_TIME_PROP_DAY, 4), RET_OK);
ASSERT_EQ(tk_object_get_prop_uint32(obj, OBJECT_DATE_TIME_PROP_DAY, 0), 4);
ASSERT_EQ(tk_object_set_prop_uint32(obj, OBJECT_DATE_TIME_PROP_HOUR, 5), RET_OK);
ASSERT_EQ(tk_object_get_prop_uint32(obj, OBJECT_DATE_TIME_PROP_HOUR, 0), 5);
ASSERT_EQ(tk_object_set_prop_uint32(obj, OBJECT_DATE_TIME_PROP_MINUTE, 6), RET_OK);
ASSERT_EQ(tk_object_get_prop_uint32(obj, OBJECT_DATE_TIME_PROP_MINUTE, 0), 6);
ASSERT_EQ(tk_object_set_prop_uint32(obj, OBJECT_DATE_TIME_PROP_SECOND, 7), RET_OK);
ASSERT_EQ(tk_object_get_prop_uint32(obj, OBJECT_DATE_TIME_PROP_SECOND, 0), 7);
ASSERT_EQ(tk_object_set_prop_uint32(obj, OBJECT_DATE_TIME_PROP_WDAY, 1), RET_OK);
ASSERT_EQ(tk_object_get_prop_uint32(obj, OBJECT_DATE_TIME_PROP_WDAY, 0), 1);