comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 229
- a952760955b4
- parent 226
- 4eef1d49f794
- child 230
- 4f5b32a2a60f
equal
deleted
inserted
replaced
| 228:b4d7686b30dc | 229:a952760955b4 |
|---|---|
| 51 UiInteger* spinner; | 51 UiInteger* spinner; |
| 52 } WindowData; | 52 } WindowData; |
| 53 | 53 |
| 54 static UiIcon* folder_icon; | 54 static UiIcon* folder_icon; |
| 55 | 55 |
| 56 UiList* menuList; | |
| 57 | |
| 58 | |
| 56 void action1(UiEvent* event, void* data) { | 59 void action1(UiEvent* event, void* data) { |
| 57 char* action = data; | 60 char* action = data; |
| 58 | 61 |
| 59 WindowData* wdata = event->window; | 62 WindowData* wdata = event->window; |
| 60 int64_t is_checked = wdata->check->get(wdata->check); | 63 int64_t is_checked = wdata->check->get(wdata->check); |
| 65 double d = wdata->progress->get(wdata->progress); | 68 double d = wdata->progress->get(wdata->progress); |
| 66 wdata->progress->set(wdata->progress, d + 1); | 69 wdata->progress->set(wdata->progress, d + 1); |
| 67 | 70 |
| 68 int spinner_active = wdata->spinner->get(wdata->spinner); | 71 int spinner_active = wdata->spinner->get(wdata->spinner); |
| 69 wdata->spinner->set(wdata->spinner, !spinner_active); | 72 wdata->spinner->set(wdata->spinner, !spinner_active); |
| 73 | |
| 74 ui_list_append(menuList, "List Item X"); | |
| 75 ui_list_append(menuList, "List Item X"); | |
| 76 ui_notify(menuList->observers, NULL); | |
| 70 } | 77 } |
| 71 | 78 |
| 72 void action_set_checkbox(UiEvent* event, void* data) { | 79 void action_set_checkbox(UiEvent* event, void* data) { |
| 73 char* action = data; | 80 char* action = data; |
| 74 | 81 |
| 160 | 167 |
| 161 void drop(UiEvent* event, void* data) { | 168 void drop(UiEvent* event, void* data) { |
| 162 | 169 |
| 163 } | 170 } |
| 164 | 171 |
| 172 | |
| 165 void application_startup(UiEvent* event, void* data) { | 173 void application_startup(UiEvent* event, void* data) { |
| 174 UiContext* gctx = ui_global_context(); | |
| 175 menuList = ui_list_new(gctx, "menulist"); | |
| 176 ui_list_append(menuList, "List Item 1"); | |
| 177 ui_list_append(menuList, "List Item 2"); | |
| 178 ui_list_append(menuList, "List Item 3"); | |
| 179 ui_list_append(menuList, "List Item 4"); | |
| 180 ui_list_append(menuList, "List Item 5"); | |
| 181 ui_list_append(menuList, "List Item 6"); | |
| 182 | |
| 166 UiObject* obj = ui_window("Test", NULL); | 183 UiObject* obj = ui_window("Test", NULL); |
| 167 WindowData* wdata = ui_malloc(obj->ctx, sizeof(WindowData)); | 184 WindowData* wdata = ui_malloc(obj->ctx, sizeof(WindowData)); |
| 168 obj->window = wdata; | 185 obj->window = wdata; |
| 169 wdata->check = ui_int_new(obj->ctx, "check"); | 186 wdata->check = ui_int_new(obj->ctx, "check"); |
| 170 wdata->toggle = ui_int_new(obj->ctx, "toggle"); | 187 wdata->toggle = ui_int_new(obj->ctx, "toggle"); |
| 349 | 366 |
| 350 ui_toolbar_menu("Menu", .label = "Menu") { | 367 ui_toolbar_menu("Menu", .label = "Menu") { |
| 351 | 368 |
| 352 ui_menuitem(.label = "x", NULL, NULL); | 369 ui_menuitem(.label = "x", NULL, NULL); |
| 353 ui_menuitem(.label = "x", NULL, NULL); | 370 ui_menuitem(.label = "x", NULL, NULL); |
| 371 ui_menu_itemlist(.varname = "menulist"); | |
| 354 ui_menuitem(.label = "x", NULL, NULL); | 372 ui_menuitem(.label = "x", NULL, NULL); |
| 355 ui_menuitem(.label = "x", NULL, NULL); | 373 ui_menuitem(.label = "x", NULL, NULL); |
| 356 ui_menuitem(.label = "x", NULL, NULL); | 374 ui_menuitem(.label = "x", NULL, NULL); |
| 357 ui_menu("TB Sub") { | 375 ui_menu("TB Sub") { |
| 358 ui_menuitem("TB subitem", NULL, NULL); | 376 ui_menuitem("TB subitem", NULL, NULL); |
