Skip to content

Commit 0749f9b

Browse files
committed
fix bugs in ftk demo
in demo_popup.c, use 'ftk_popup_menu_set_clicked_listener' to handle clicking of list item, in demo_listview.c, fix the format string of icon file name, in demo_menu.c, fix the incorret increment of window id, for demo_image.c, install the used image 'png_RGB_tRNS.png'
1 parent e64281f commit 0749f9b

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

src/demos/demo_listview.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,10 @@ FTK_HIDE int FTK_MAIN(int argc, char* argv[])
8888

8989
model = ftk_list_model_default_create(10);
9090
render = ftk_list_render_default_create();
91-
ftk_snprintf(filename, FTK_MAX_PATH, "%s/alarm/%s",
91+
ftk_snprintf(filename, FTK_MAX_PATH, "%s/alarm%s",
9292
ftk_config_get_test_data_dir(ftk_default_config()), FTK_STOCK_IMG_SUFFIX);
9393
left_icon = ftk_bitmap_factory_load(ftk_default_bitmap_factory(), filename);
94-
ftk_snprintf(filename, FTK_MAX_PATH, "%s/search/%s",
94+
ftk_snprintf(filename, FTK_MAX_PATH, "%s/search%s",
9595
ftk_config_get_test_data_dir(ftk_default_config()), FTK_STOCK_IMG_SUFFIX);
9696
right_icon = ftk_bitmap_factory_load(ftk_default_bitmap_factory(), filename);
9797

src/demos/demo_menu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ static void create_app_window(void)
7070
label = ftk_label_create(win, 10, height/2, width-20, 60);
7171

7272
ftk_snprintf(title, sizeof(title),
73-
"Press F2 to open menu, Presss F3 close window%02d", g_index++);
73+
"Press F2 to open menu, Presss F3 close window%02d", g_index);
7474
ftk_widget_set_text(label, title);
7575

7676
ftk_snprintf(title, sizeof(title), "window%02d", g_index++);

src/demos/demo_popup.c

+7-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ static Ret button_normal_clicked(void* ctx, void* obj)
2929
ftk_popup_menu_add(thiz, g_infos+i);
3030
}
3131
ftk_bitmap_unref(icon);
32-
32+
33+
ftk_popup_menu_set_clicked_listener(thiz, on_menu_item_clicked, NULL);
34+
3335
ftk_widget_show_all(thiz, 1);
3436

3537
return RET_OK;
@@ -49,6 +51,8 @@ static Ret button_radio_clicked(void* ctx, void* obj)
4951
}
5052
ftk_bitmap_unref(icon);
5153

54+
ftk_popup_menu_set_clicked_listener(thiz, on_menu_item_clicked, NULL);
55+
5256
ftk_widget_show_all(thiz, 1);
5357

5458
return RET_OK;
@@ -68,6 +72,8 @@ static Ret button_check_clicked(void* ctx, void* obj)
6872
}
6973
ftk_bitmap_unref(icon);
7074

75+
ftk_popup_menu_set_clicked_listener(thiz, on_menu_item_clicked, NULL);
76+
7177
ftk_widget_show_all(thiz, 1);
7278

7379
return RET_OK;
@@ -97,10 +103,6 @@ FTK_HIDE int FTK_MAIN(int argc, char* argv[])
97103
g_infos[1].text = "Paste";
98104
g_infos[2].text = "Cut";
99105
g_infos[3].text = "Select All";
100-
g_infos[0].extra_user_data = on_menu_item_clicked;
101-
g_infos[1].extra_user_data = on_menu_item_clicked;
102-
g_infos[2].extra_user_data = on_menu_item_clicked;
103-
g_infos[3].extra_user_data = on_menu_item_clicked;
104106

105107
win = ftk_app_window_create();
106108
width = ftk_widget_width(win);

testdata/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ EXTRA_DIST=\
99
Chat.png iPod.png Notes.png Sms.png\
1010
Clock.png IP.png Photos.png Stock.png\
1111
Customize.png iradio.png Twitter.png\
12-
jpeg1.jpg t1.bmp t24.bmp t4.bmp t8.bmp
12+
jpeg1.jpg t1.bmp t24.bmp t4.bmp t8.bmp png_RGB_tRNS.png
1313

1414
testdatadir=$(datadir)/ftk/testdata
1515
testdata_DATA=$(EXTRA_DIST)

0 commit comments

Comments
 (0)