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

format code

Browse Source
This commit is contained in:
lixianjing 2021-04-20 18:25:27 +08:00
parent c56d50b3a1
commit 3c3ff112a4
10 changed files with 48 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/base/text_edit.c
View File

@ -787,21 +787,21 @@ static int text_edit_insert(STB_TEXTEDIT_STRING* str, int pos, STB_TEXTEDIT_CHAR
#define STB_TEXTEDIT_K_SHIFT 0x40000000
#define STB_TEXTEDIT_K_CONTROL 0x20000000
#define STB_TEXTEDIT_K_LEFT (KEYDOWN_BIT | 1)
#define STB_TEXTEDIT_K_RIGHT (KEYDOWN_BIT | 2) // VK_RIGHT
#define STB_TEXTEDIT_K_UP (KEYDOWN_BIT | 3) // VK_UP
#define STB_TEXTEDIT_K_DOWN (KEYDOWN_BIT | 4) // VK_DOWN
#define STB_TEXTEDIT_K_RIGHT (KEYDOWN_BIT | 2) // VK_RIGHT
#define STB_TEXTEDIT_K_UP (KEYDOWN_BIT | 3) // VK_UP
#define STB_TEXTEDIT_K_DOWN (KEYDOWN_BIT | 4) // VK_DOWN
#define STB_TEXTEDIT_K_LINESTART (KEYDOWN_BIT | 5) // VK_HOME
#define STB_TEXTEDIT_K_LINEEND (KEYDOWN_BIT | 6) // VK_END
#define STB_TEXTEDIT_K_LINEEND (KEYDOWN_BIT | 6) // VK_END
#define STB_TEXTEDIT_K_TEXTSTART (STB_TEXTEDIT_K_LINESTART | STB_TEXTEDIT_K_CONTROL)
#define STB_TEXTEDIT_K_TEXTEND (STB_TEXTEDIT_K_LINEEND | STB_TEXTEDIT_K_CONTROL)
#define STB_TEXTEDIT_K_DELETE (KEYDOWN_BIT | 7) // VK_DELETE
#define STB_TEXTEDIT_K_DELETE (KEYDOWN_BIT | 7) // VK_DELETE
#define STB_TEXTEDIT_K_BACKSPACE (KEYDOWN_BIT | 8) // VK_BACKSPACE
#define STB_TEXTEDIT_K_UNDO (KEYDOWN_BIT | STB_TEXTEDIT_K_CONTROL | 'z')
#define STB_TEXTEDIT_K_REDO (KEYDOWN_BIT | STB_TEXTEDIT_K_CONTROL | 'y')
#define STB_TEXTEDIT_K_INSERT (KEYDOWN_BIT | 9) // VK_INSERT
#define STB_TEXTEDIT_K_WORDLEFT (STB_TEXTEDIT_K_LEFT | STB_TEXTEDIT_K_CONTROL)
#define STB_TEXTEDIT_K_WORDRIGHT (STB_TEXTEDIT_K_RIGHT | STB_TEXTEDIT_K_CONTROL)
#define STB_TEXTEDIT_K_PGUP (KEYDOWN_BIT | 10) // VK_PGUP -- not implemented
#define STB_TEXTEDIT_K_PGUP (KEYDOWN_BIT | 10) // VK_PGUP -- not implemented
#define STB_TEXTEDIT_K_PGDOWN (KEYDOWN_BIT | 11) // VK_PGDOWN -- not implemented
#define STB_TEXTEDIT_IMPLEMENTATION 1

2
src/ext_widgets/file_browser/file_chooser.h
View File

@ -39,7 +39,7 @@ typedef struct _file_chooser_t {
* 初始目录。
*/
char* init_dir;
/**
* @property {char*} top_dir
* 最顶层目录。到达本目录后，不允许往上。

4
src/ext_widgets/mutable_image/mutable_image.h
View File

@ -80,7 +80,7 @@ typedef struct _mutable_image_t {
uint32_t timer_id;
void* prepare_image_ctx;
mutable_image_prepare_image_t prepare_image;
void* need_redraw_ctx;
mutable_image_need_redraw_t need_redraw;
@ -119,7 +119,7 @@ widget_t* mutable_image_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h)
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t mutable_image_set_need_redraw(widget_t* widget, mutable_image_need_redraw_t need_redraw,
void* need_redraw_ctx);
void* need_redraw_ctx);
/**
* @method mutable_image_set_prepare_image

2
src/tkc/fscript.h
View File

@ -89,7 +89,7 @@ typedef struct _fscript_parser_error_t {
* 错误信息。
*/
char* message;
/**
* @property {char*} token
* @annotation ["readable"]

2
src/widgets/combo_box.c
View File

@ -317,7 +317,7 @@ static ret_t combo_box_on_event(widget_t* widget, event_t* e) {
combo_box_sync_index_to_value(widget, combo_box->selected_index);
}
if (widget->text.size == 0 && widget->tr_text == NULL){
if (widget->text.size == 0 && widget->tr_text == NULL) {
combo_box_set_selected_index(widget, 0);
}
break;

13
tests/app_conf_multi_threads.cpp
View File

@ -13,19 +13,18 @@
static void* work_thread(void* args) {
uint32_t i = 0;
uint32_t id = (uint32_t)tk_pointer_to_int(args);
log_debug("%u start\n", id);
for(i = 0; i < NR; i++) {
for (i = 0; i < NR; i++) {
app_conf_set_int("test.int", i);
app_conf_set_double("test.int", i);
app_conf_set_str("test.str", "foo");
log_debug("%u run %u\n", id, i);
}
return NULL;
}
int main(int argc, char* argv[]) {
uint32_t i = 0;
tk_thread_t* threads[100];
@ -43,12 +42,12 @@ int main(int argc, char* argv[]) {
app_conf_set_int("test.int", 100);
app_conf_save();
for(i = 0; i < ARRAY_SIZE(threads); i++) {
for (i = 0; i < ARRAY_SIZE(threads); i++) {
threads[i] = tk_thread_create(work_thread, tk_pointer_from_int(i));
tk_thread_start(threads[i]);
}
for(i = 0; i < ARRAY_SIZE(threads); i++) {
for (i = 0; i < ARRAY_SIZE(threads); i++) {
tk_thread_join(threads[i]);
tk_thread_destroy(threads[i]);
log_debug("%u stop\n", i);

32
tests/bitmap_test.cc
View File

@ -137,21 +137,21 @@ TEST(Bitmap, mono_from_rgba) {
}
TEST(Bitmap, clone) {
bitmap_t* b = bitmap_create_ex(10, 20, 0, BITMAP_FMT_BGRA8888);
uint8_t* buff = bitmap_lock_buffer_for_write(b);
memset(buff, 0x12, b->w * b->h * 4);
bitmap_unlock_buffer(b);
bitmap_t* b1 = bitmap_clone(b);
bitmap_destroy(b);
ASSERT_EQ(b1->w, 10);
ASSERT_EQ(b1->h, 20);
ASSERT_EQ(b1->format, BITMAP_FMT_BGRA8888);
buff = bitmap_lock_buffer_for_write(b1);
ASSERT_EQ(buff[0], 0x12);
ASSERT_EQ(buff[1], 0x12);
ASSERT_EQ(buff[2], 0x12);
ASSERT_EQ(buff[3], 0x12);
bitmap_unlock_buffer(b1);
bitmap_t* b = bitmap_create_ex(10, 20, 0, BITMAP_FMT_BGRA8888);
uint8_t* buff = bitmap_lock_buffer_for_write(b);
memset(buff, 0x12, b->w * b->h * 4);
bitmap_unlock_buffer(b);
bitmap_t* b1 = bitmap_clone(b);
bitmap_destroy(b);
ASSERT_EQ(b1->w, 10);
ASSERT_EQ(b1->h, 20);
ASSERT_EQ(b1->format, BITMAP_FMT_BGRA8888);
buff = bitmap_lock_buffer_for_write(b1);
ASSERT_EQ(buff[0], 0x12);
ASSERT_EQ(buff[1], 0x12);
ASSERT_EQ(buff[2], 0x12);
ASSERT_EQ(buff[3], 0x12);
bitmap_unlock_buffer(b1);
bitmap_destroy(b1);
bitmap_destroy(b1);
}

4
tests/fscript_test.cc
View File

@ -1189,13 +1189,13 @@ TEST(FExr, syntax_check) {
fscript_syntax_check(obj, "1", &error);
ASSERT_EQ(error.message, (const char*)NULL);
fscript_parser_error_deinit(&error);
fscript_syntax_check(obj, "(1+1", &error);
ASSERT_STREQ(error.message, "expect )");
ASSERT_EQ(error.row, 0);
ASSERT_EQ(error.col, 4);
ASSERT_EQ(error.offset, 4);
fscript_syntax_check(obj, "1+1)", &error);
ASSERT_STREQ(error.token, ")");
ASSERT_STREQ(error.message, "unexpected token\n");

10
tests/path_test.cc
View File

@ -167,11 +167,11 @@ TEST(Path, path_remove_last_slash) {
strcpy(result, "./a/");
ASSERT_EQ(path_remove_last_slash(result), RET_OK);
ASSERT_STREQ(result, "./a");
strcpy(result, "./a\\");
ASSERT_EQ(path_remove_last_slash(result), RET_OK);
ASSERT_STREQ(result, "./a");
strcpy(result, "./");
ASSERT_EQ(path_remove_last_slash(result), RET_OK);
ASSERT_STREQ(result, ".");
@ -179,14 +179,14 @@ TEST(Path, path_remove_last_slash) {
strcpy(result, "/");
ASSERT_EQ(path_remove_last_slash(result), RET_OK);
ASSERT_STREQ(result, "/");
strcpy(result, "////");
ASSERT_EQ(path_remove_last_slash(result), RET_OK);
ASSERT_STREQ(result, "/");
strcpy(result, "/a/b//");
ASSERT_EQ(path_remove_last_slash(result), RET_OK);
ASSERT_STREQ(result, "/a/b");
ASSERT_NE(path_remove_last_slash(NULL), RET_OK);
}

18
tests/text_edit_test.cc
View File

@ -7,7 +7,6 @@
#include "base/window.h"
#include "lcd/lcd_mem_rgba8888.h"
TEST(TextEdit, basic) {
str_t str;
key_event_t keye;
@ -60,13 +59,13 @@ TEST(TextEdit, cursor) {
widget_t* w = mledit_create(NULL, 10, 20, 30, 40);
text_edit_t* text_edit = text_edit_create(w, FALSE);
widget_set_text_utf8(w, str);
ASSERT_EQ(text_edit_set_cursor(text_edit, 0), RET_OK);
ASSERT_EQ(text_edit_get_cursor(text_edit), 0);
ASSERT_EQ(text_edit_set_cursor(text_edit, 5), RET_OK);
ASSERT_EQ(text_edit_get_cursor(text_edit), 5);
ASSERT_EQ(text_edit_set_cursor(text_edit, 500), RET_OK);
ASSERT_EQ(text_edit_get_cursor(text_edit), strlen(str));
@ -80,11 +79,11 @@ TEST(TextEdit, select) {
widget_t* w = mledit_create(NULL, 10, 20, 30, 40);
text_edit_t* text_edit = text_edit_create(w, FALSE);
widget_set_text_utf8(w, str);
ASSERT_EQ(text_edit_set_select(text_edit, 0, 0), RET_OK);
select = text_edit_get_selected_text(text_edit);
ASSERT_STREQ(select, NULL);
ASSERT_EQ(text_edit_set_select(text_edit, 0, 3), RET_OK);
select = text_edit_get_selected_text(text_edit);
ASSERT_STREQ(select, "it ");
@ -94,12 +93,12 @@ TEST(TextEdit, select) {
select = text_edit_get_selected_text(text_edit);
ASSERT_STREQ(select, " is");
TKMEM_FREE(select);
ASSERT_EQ(text_edit_set_select(text_edit, 2, 50), RET_OK);
select = text_edit_get_selected_text(text_edit);
ASSERT_STREQ(select, " is ok");
TKMEM_FREE(select);
widget_destroy(w);
text_edit_destroy(text_edit);
}
@ -109,7 +108,7 @@ TEST(TextEdit, get_height) {
lcd_t* lcd = lcd_mem_rgba8888_create(100, 100, TRUE);
canvas_init(&c, lcd, font_manager());
const char* str = "it\nis\nok\nsecond line";
widget_t* win = window_create(NULL, 0, 0, 0,0);
widget_t* win = window_create(NULL, 0, 0, 0, 0);
widget_t* w = mledit_create(win, 10, 20, 30, 40);
text_edit_t* text_edit = text_edit_create(w, FALSE);
@ -117,11 +116,10 @@ TEST(TextEdit, get_height) {
widget_set_prop_pointer(win, WIDGET_PROP_CANVAS, &c);
text_edit_set_canvas(text_edit, widget_get_canvas(w));
widget_set_prop_pointer(win, WIDGET_PROP_CANVAS, NULL);
ASSERT_EQ(text_edit_get_height(text_edit, 0), 0);
ASSERT_EQ(text_edit_get_height(text_edit, 4), 22);
widget_destroy(win);
text_edit_destroy(text_edit);
}