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-10-26 10:21:03 +08:00
parent bb69ed7a72
commit 16454ad1d0
14 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/base/hscrollable.c
View File

@ -119,7 +119,7 @@ ret_t hscrollable_scroll_to(hscrollable_t* hscrollable, int32_t xoffset_end, int
widget_animator_scroll_set_params(hscrollable->wa, xoffset, 0, xoffset_end, 0);
widget_animator_on(hscrollable->wa, EVT_ANIM_END, hscrollable_on_scroll_done, hscrollable);
widget_animator_start(hscrollable->wa);
widget_animator_start(hscrollable->wa);
return RET_OK;
}
#endif /*WITHOUT_WIDGET_ANIMATORS*/
@ -327,7 +327,8 @@ ret_t hscrollable_set_virtual_w(hscrollable_t* hscrollable, int32_t virtual_w) {
return RET_OK;
}
ret_t hscrollable_set_enable_hscroll_animator(hscrollable_t* hscrollable, bool_t enable_hscroll_animator){
ret_t hscrollable_set_enable_hscroll_animator(hscrollable_t* hscrollable,
bool_t enable_hscroll_animator) {
return_value_if_fail(hscrollable != NULL, RET_BAD_PARAMS);
hscrollable->enable_hscroll_animator = enable_hscroll_animator;

3
src/base/hscrollable.h
View File

@ -52,7 +52,8 @@ hscrollable_t* hscrollable_create(widget_t* widget);
ret_t hscrollable_set_xoffset(hscrollable_t* hscrollable, int32_t xoffset);
ret_t hscrollable_set_virtual_w(hscrollable_t* hscrollable, int32_t virtual_w);
ret_t hscrollable_set_always_scrollable(hscrollable_t* hscrollable, bool_t always_scrollable);
ret_t hscrollable_set_enable_hscroll_animator(hscrollable_t* hscrollable, bool_t enable_hscroll_animator);
ret_t hscrollable_set_enable_hscroll_animator(hscrollable_t* hscrollable,
bool_t enable_hscroll_animator);
ret_t hscrollable_on_event(hscrollable_t* hscrollable, event_t* e);
ret_t hscrollable_get_prop(hscrollable_t* hscrollable, const char* name, value_t* v);

5
src/base/line_parser.h
View File

@ -122,13 +122,14 @@ static ret_t line_parser_next(line_parser_t* parser) {
parser->line_size = wcslen(parser->str);
} else {
if (line_number + 1 < parser->nline_numbers) {
parser->line_size = parser->line_numbers[line_number + 1] - parser->line_numbers[line_number];
parser->line_size =
parser->line_numbers[line_number + 1] - parser->line_numbers[line_number];
} else {
parser->line_size = wcslen(parser->line);
}
}
return RET_OK;
}
}
return RET_EOS;
}

6
src/base/vgcanvas.c
View File

@ -300,8 +300,10 @@ ret_t vgcanvas_draw_image(vgcanvas_t* vg, bitmap_t* img, float_t sx, float_t sy,
}
ret_t vgcanvas_draw_image_repeat(vgcanvas_t* vg, bitmap_t* img, float_t sx, float_t sy, float_t sw,
float_t sh, float_t dx, float_t dy, float_t dw, float_t dh, float_t dst_w, float_t dst_h) {
return_value_if_fail(vg != NULL && vg->vt->draw_image_repeat != NULL && img != NULL, RET_BAD_PARAMS);
float_t sh, float_t dx, float_t dy, float_t dw, float_t dh,
float_t dst_w, float_t dst_h) {
return_value_if_fail(vg != NULL && vg->vt->draw_image_repeat != NULL && img != NULL,
RET_BAD_PARAMS);
return vg->vt->draw_image_repeat(vg, img, sx, sy, sw, sh, dx, dy, dw, dh, dst_w, dst_h);
}

7
src/base/vgcanvas.h
View File

@ -106,8 +106,8 @@ typedef ret_t (*vgcanvas_draw_image_t)(vgcanvas_t* vg, bitmap_t* img, float_t sx
float_t dh);
typedef ret_t (*vgcanvas_draw_image_repeat_t)(vgcanvas_t* vg, bitmap_t* img, float_t sx, float_t sy,
float_t sw, float_t sh, float_t dx, float_t dy, float_t dw,
float_t dh, float_t dst_w, float_t dst_h);
float_t sw, float_t sh, float_t dx, float_t dy,
float_t dw, float_t dh, float_t dst_w, float_t dst_h);
typedef ret_t (*vgcanvas_set_antialias_t)(vgcanvas_t* vg, bool_t value);
typedef ret_t (*vgcanvas_set_global_alpha_t)(vgcanvas_t* vg, float_t alpha);
@ -991,7 +991,8 @@ ret_t vgcanvas_draw_image(vgcanvas_t* vg, bitmap_t* img, float_t sx, float_t sy,
* @return {ret_t} 返回RET_OK表示成功，否则表示失败。
*/
ret_t vgcanvas_draw_image_repeat(vgcanvas_t* vg, bitmap_t* img, float_t sx, float_t sy, float_t sw,
float_t sh, float_t dx, float_t dy, float_t dw, float_t dh, float_t dst_w, float_t dst_h);
float_t sh, float_t dx, float_t dy, float_t dw, float_t dh,
float_t dst_w, float_t dst_h);
/**
* @method vgcanvas_draw_icon

6
src/base/window_base.c
View File

@ -448,7 +448,7 @@ ret_t window_base_on_event(widget_t* widget, event_t* e) {
if (win->pressed) {
pointer_event_t abort;
pointer_event_init(&abort, EVT_POINTER_DOWN_ABORT, widget, 0, 0);
widget_on_pointer_up(widget, &abort);
widget_on_pointer_up(widget, &abort);
}
if (widget->parent != NULL && widget->parent->grab_widget == widget) {
@ -499,13 +499,13 @@ static ret_t window_on_keydown_before_children(void* ctx, event_t* e) {
base->moving_focus_mode = !base->moving_focus_mode;
log_debug("change moving_focus_mode:%d\n", base->moving_focus_mode);
#ifdef WITH_STATE_ACTIVATED
#ifdef WITH_STATE_ACTIVATED
if (!base->moving_focus_mode) {
widget_set_state(focus, WIDGET_STATE_ACTIVATED);
} else {
widget_set_state(focus, WIDGET_STATE_FOCUSED);
}
#endif/*WITH_STATE_ACTIVATED*/
#endif /*WITH_STATE_ACTIVATED*/
return RET_OK;
}

2
src/ext_widgets/features/draggable.h
View File

@ -113,7 +113,7 @@ typedef struct _draggable_t {
* 拖动窗口而不是父控件。比如放在对话框的titlebar上，拖动titlebar其实是希望拖动对话框。
*/
bool_t drag_window;
/**
* @property {uint32_t} drag_parent
* @annotation ["set_prop","get_prop","readable","persitent","design","scriptable"]

9
src/ext_widgets/gif_image/gif_image.c
View File

@ -149,10 +149,11 @@ static ret_t gif_image_on_paint_self(widget_t* widget, canvas_t* c) {
return RET_OK;
}
static const char* s_gif_image_properties[] = {
WIDGET_PROP_IMAGE, WIDGET_PROP_SCALE_X, WIDGET_PROP_SCALE_Y,
WIDGET_PROP_ANCHOR_X, WIDGET_PROP_ANCHOR_Y, WIDGET_PROP_ROTATION,
WIDGET_PROP_CLICKABLE, WIDGET_PROP_SELECTABLE, WIDGET_PROP_LOOP, NULL};
static const char* s_gif_image_properties[] = {WIDGET_PROP_IMAGE, WIDGET_PROP_SCALE_X,
WIDGET_PROP_SCALE_Y, WIDGET_PROP_ANCHOR_X,
WIDGET_PROP_ANCHOR_Y, WIDGET_PROP_ROTATION,
WIDGET_PROP_CLICKABLE, WIDGET_PROP_SELECTABLE,
WIDGET_PROP_LOOP, NULL};
static ret_t gif_image_on_destroy(widget_t* widget) {
gif_image_t* image = GIF_IMAGE(widget);

2
src/ext_widgets/gif_image/gif_image.h
View File

@ -86,7 +86,7 @@ typedef struct _gif_image_t {
*
*/
bool_t running;
/**
* @property {uint32_t} loop
* @annotation ["set_prop","get_prop","readable","persitent","design","scriptable"]

6
src/tkc/fscript.h
View File

@ -278,10 +278,10 @@ double tk_expr_eval(const char* expr);
#define STR_FSCRIPT_FUNCTION_PREFIX "function."
/*用于扩展函数里检查参数*/
#define FSCRIPT_FUNC_CHECK(predicate, code) \
if (!(predicate)) { \
#define FSCRIPT_FUNC_CHECK(predicate, code) \
if (!(predicate)) { \
fscript_set_error(fscript, code, __FUNCTION__, "" #predicate " not satisfied."); \
return code; \
return code; \
}
END_C_DECLS

2
tests/draggable_test.cc
View File

@ -42,7 +42,7 @@ TEST(Draggable, basic) {
ASSERT_EQ(widget_get_prop_int(d, DRAGGABLE_PROP_TOP, 0), draggable->top);
ASSERT_EQ(widget_get_prop_int(d, DRAGGABLE_PROP_RIGHT, 0), draggable->right);
ASSERT_EQ(widget_get_prop_int(d, DRAGGABLE_PROP_BOTTOM, 0), draggable->bottom);
ASSERT_EQ(widget_set_prop_int(d, DRAGGABLE_PROP_DRAG_WINDOW, 1), RET_OK);
ASSERT_EQ(widget_get_prop_int(d, DRAGGABLE_PROP_DRAG_WINDOW, 0), 1);

11
tests/fscript_test.cc
View File

@ -1279,11 +1279,11 @@ TEST(FExr, get) {
fscript_eval(obj, "value_is_valid(get(abc))", &v);
ASSERT_EQ(value_bool(&v), FALSE);
value_reset(&v);
fscript_eval(obj, "abc=123;value_is_valid(get(abc))", &v);
ASSERT_EQ(value_bool(&v), TRUE);
value_reset(&v);
OBJECT_UNREF(obj);
}
@ -1294,11 +1294,11 @@ TEST(FExr, dollor) {
fscript_eval(obj, "value_is_valid($abc)", &v);
ASSERT_EQ(value_bool(&v), FALSE);
value_reset(&v);
fscript_eval(obj, "abc=123;value_is_valid(abc)", &v);
ASSERT_EQ(value_bool(&v), TRUE);
value_reset(&v);
OBJECT_UNREF(obj);
}
@ -1313,7 +1313,6 @@ TEST(FExr, get_last_error) {
ASSERT_EQ(object_get_prop_int(error, "col", 0), 10);
ASSERT_STREQ(object_get_prop_str(error, "message"), "args->size == 1 not satisfied.");
value_reset(&v);
OBJECT_UNREF(obj);
}

2
tests/gif_image_test.cc
View File

@ -13,7 +13,7 @@ TEST(GifImage, basic) {
ASSERT_EQ(widget_get_prop(img, WIDGET_PROP_IMAGE, &v1), RET_OK);
ASSERT_EQ(strcmp(value_str(&v), value_str(&v1)), 0);
ASSERT_EQ(widget_count_children(w), 1);
ASSERT_EQ((uint32_t)widget_get_prop_int(img, WIDGET_PROP_LOOP, 0), 0xffffffff);
ASSERT_EQ(widget_set_prop_int(img, WIDGET_PROP_LOOP, 1), RET_OK);
ASSERT_EQ(widget_get_prop_int(img, WIDGET_PROP_LOOP, 0), 1);

14
tests/str_test.cc
View File

@ -393,11 +393,11 @@ TEST(Str, append_n_chars) {
str_clear(&str);
ASSERT_EQ(str_append_n_chars(&str, ' ', 1), RET_OK);
ASSERT_STREQ(str.str, " ");
str_clear(&str);
ASSERT_EQ(str_append_n_chars(&str, ' ', 2), RET_OK);
ASSERT_STREQ(str.str, " ");
str_clear(&str);
ASSERT_EQ(str_append_n_chars(&str, ' ', 5), RET_OK);
ASSERT_STREQ(str.str, " ");
@ -412,22 +412,22 @@ TEST(Str, common_prefix) {
str_set(&str, "abc.cde.123");
ASSERT_EQ(str_common_prefix(&str, "abc.123"), RET_OK);
ASSERT_STREQ(str.str, "abc.");
str_set(&str, "abc.cde.123");
ASSERT_EQ(str_common_prefix(&str, "abc.c123"), RET_OK);
ASSERT_STREQ(str.str, "abc.c");
str_set(&str, "abc.cde.123");
ASSERT_EQ(str_common_prefix(&str, "c123"), RET_OK);
ASSERT_STREQ(str.str, "");
str_set(&str, "abc.cde.123");
ASSERT_EQ(str_common_prefix(&str, "abc.cde.123"), RET_OK);
ASSERT_STREQ(str.str, "abc.cde.123");
str_set(&str, "");
ASSERT_EQ(str_common_prefix(&str, "abc.cde.123"), RET_OK);
ASSERT_STREQ(str.str, "");
str_reset(&str);
}