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

fix combo_box clone

Browse Source
This commit is contained in:
lixianjing 2019-10-23 11:20:08 +08:00
parent 60565094dd
commit 43ff3f927d
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/widgets/combo_box.c
View File

@ -29,6 +29,8 @@
#include "tkc/tokenizer.h"
#include "widgets/combo_box_item.h"
static ret_t combo_box_on_button_click(void* ctx, event_t* e);
const char* s_combo_box_properties[] = {WIDGET_PROP_MIN,
WIDGET_PROP_MAX,
WIDGET_PROP_STEP,
@ -41,8 +43,11 @@ const char* s_combo_box_properties[] = {WIDGET_PROP_MIN,
WIDGET_PROP_TOP_MARGIN,
WIDGET_PROP_BOTTOM_MARGIN,
WIDGET_PROP_TIPS,
WIDGET_PROP_OPTIONS,
WIDGET_PROP_ITEM_HEIGHT,
WIDGET_PROP_OPEN_WINDOW,
WIDGET_PROP_SELECTED_INDEX,
WIDGET_PROP_LOCALIZE_OPTIONS,
NULL};
static widget_t* combo_box_create_self(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h);
@ -194,6 +199,12 @@ static ret_t combo_box_on_event(widget_t* widget, event_t* e) {
return edit_on_event(widget, e);
}
static ret_t combo_box_on_add_child(widget_t* widget, widget_t* child) {
widget_on(child, EVT_CLICK, combo_box_on_button_click, widget);
return RET_FAIL;
}
TK_DECL_VTABLE(combo_box) = {.size = sizeof(combo_box_t),
.inputable = TRUE,
.type = WIDGET_TYPE_COMBO_BOX,
@ -204,6 +215,7 @@ TK_DECL_VTABLE(combo_box) = {.size = sizeof(combo_box_t),
.on_paint_self = edit_on_paint_self,
.set_prop = combo_box_set_prop,
.get_prop = combo_box_get_prop,
.on_add_child = combo_box_on_add_child,
.on_layout_children = combo_box_on_layout_children,
.on_destroy = combo_box_on_destroy,
.on_event = combo_box_on_event};
@ -350,8 +362,6 @@ widget_t* combo_box_create(widget_t* parent, xy_t x, xy_t y, wh_t w, wh_t h) {
widget_set_name(popup, "popup");
widget_use_style(popup, "combobox_down");
widget_on(popup, EVT_CLICK, combo_box_on_button_click, widget);
return widget;
}

17
tests/combo_box_test.cc
View File

@ -177,3 +177,20 @@ TEST(ComboBox, move_resize) {
widget_destroy(w);
}
TEST(ComboBox, clone) {
widget_t* w2 = NULL;
widget_t* w1 = combo_box_create(NULL, 0, 0, 100, 100);
const char* str = "1:red;2:green;3:blue";
ASSERT_EQ(combo_box_set_options(w1, str), RET_OK);
ASSERT_EQ(combo_box_set_selected_index(w1, 0), RET_OK);
ASSERT_STREQ(COMBO_BOX(w1)->options, str);
w2 = widget_clone(w1, NULL);
ASSERT_EQ(widget_equal(w1, w2), TRUE);
widget_destroy(w1);
widget_destroy(w2);
}