comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 221
- a82d9beaa94a
- parent 220
- e377456302df
- child 223
- 8d7ca1b320e2
equal
deleted
inserted
replaced
| 220:e377456302df | 221:a82d9beaa94a |
|---|---|
| 45 UiString* t2; | 45 UiString* t2; |
| 46 UiString* t3; | 46 UiString* t3; |
| 47 UiList* list2; | 47 UiList* list2; |
| 48 UiList* list3; | 48 UiList* list3; |
| 49 UiDouble* progress; | 49 UiDouble* progress; |
| 50 UiInteger* spinner; | |
| 50 } WindowData; | 51 } WindowData; |
| 51 | 52 |
| 52 static UiIcon* folder_icon; | 53 static UiIcon* folder_icon; |
| 53 | 54 |
| 54 void action1(UiEvent* event, void* data) { | 55 void action1(UiEvent* event, void* data) { |
| 60 | 61 |
| 61 printf("data: %s %d\n", data, is_checked); | 62 printf("data: %s %d\n", data, is_checked); |
| 62 | 63 |
| 63 double d = wdata->progress->get(wdata->progress); | 64 double d = wdata->progress->get(wdata->progress); |
| 64 wdata->progress->set(wdata->progress, d + 1); | 65 wdata->progress->set(wdata->progress, d + 1); |
| 66 | |
| 67 int spinner_active = wdata->spinner->get(wdata->spinner); | |
| 68 wdata->spinner->set(wdata->spinner, !spinner_active); | |
| 65 } | 69 } |
| 66 | 70 |
| 67 void action_set_checkbox(UiEvent* event, void* data) { | 71 void action_set_checkbox(UiEvent* event, void* data) { |
| 68 char* action = data; | 72 char* action = data; |
| 69 | 73 |
| 153 wdata->list3 = ui_list_new(obj->ctx, "list3"); | 157 wdata->list3 = ui_list_new(obj->ctx, "list3"); |
| 154 wdata->t1 = ui_string_new(obj->ctx, "t1"); | 158 wdata->t1 = ui_string_new(obj->ctx, "t1"); |
| 155 wdata->t2 = ui_string_new(obj->ctx, "t2"); | 159 wdata->t2 = ui_string_new(obj->ctx, "t2"); |
| 156 wdata->t3 = ui_string_new(obj->ctx, "t3"); | 160 wdata->t3 = ui_string_new(obj->ctx, "t3"); |
| 157 wdata->progress = ui_double_new(obj->ctx, "progress"); | 161 wdata->progress = ui_double_new(obj->ctx, "progress"); |
| 162 wdata->spinner = ui_int_new(obj->ctx, "spinner"); | |
| 158 | 163 |
| 159 ui_list_append(wdata->list, "Hello"); | 164 ui_list_append(wdata->list, "Hello"); |
| 160 ui_list_append(wdata->list, "World"); | 165 ui_list_append(wdata->list, "World"); |
| 161 ui_list_append(wdata->list, "Item3"); | 166 ui_list_append(wdata->list, "Item3"); |
| 162 ui_list_append(wdata->list, "Item4"); | 167 ui_list_append(wdata->list, "Item4"); |
| 219 | 224 |
| 220 ui_checkbox(obj, .label = "Option 1", .value = wdata->check, .onchange = action_onchange); | 225 ui_checkbox(obj, .label = "Option 1", .value = wdata->check, .onchange = action_onchange); |
| 221 ui_togglebutton(obj, .label = "Option 2", .value = wdata->toggle); | 226 ui_togglebutton(obj, .label = "Option 2", .value = wdata->toggle); |
| 222 ui_newline(obj); | 227 ui_newline(obj); |
| 223 | 228 |
| 229 ui_label(obj, .label = "Progress"); | |
| 230 ui_progressspinner(obj, .value = wdata->spinner); | |
| 231 ui_newline(obj); | |
| 232 | |
| 224 ui_hbox(obj, .colspan = 3) { | 233 ui_hbox(obj, .colspan = 3) { |
| 225 ui_radiobutton(obj, .label = "Radio 1", .value = wdata->radio); | 234 ui_radiobutton(obj, .label = "Radio 1", .value = wdata->radio); |
| 226 ui_radiobutton(obj, .label = "Radio 2", .value = wdata->radio); | 235 ui_radiobutton(obj, .label = "Radio 2", .value = wdata->radio); |
| 227 ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio); | 236 ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio); |
| 228 } | 237 } |
| 229 ui_newline(obj); | 238 ui_newline(obj); |
| 230 ui_radiobutton(obj, .label = "Radio 4", .value = wdata->radio); | 239 ui_radiobutton(obj, .label = "Radio 4", .value = wdata->radio); |
| 231 ui_switch(obj, .label = "test", .onchange = action_switch); | 240 ui_switch(obj, .label = "test", .onchange = action_switch); |
| 232 ui_newline(obj); | 241 ui_newline(obj); |
| 233 | 242 |
| 234 ui_breadcrumbbar(obj, .list = wdata->list3, .onactivate=action_breadcrumb); | 243 //ui_breadcrumbbar(obj, .list = wdata->list3, .onactivate=action_breadcrumb); |
| 244 ui_pathbar(obj, .colspan = 3, .list = wdata->list3, .onactivate = action_breadcrumb); | |
| 235 ui_newline(obj); | 245 ui_newline(obj); |
| 236 | 246 |
| 237 ui_textfield(obj, .value = wdata->text); | 247 ui_textfield(obj, .value = wdata->text); |
| 238 ui_passwordfield(obj, .value = wdata->password); | 248 ui_passwordfield(obj, .value = wdata->password); |
| 239 ui_newline(obj); | 249 ui_newline(obj); |
| 281 | 291 |
| 282 ui_newline(obj); | 292 ui_newline(obj); |
| 283 | 293 |
| 284 UiModel* model = ui_model(obj->ctx, UI_ICON_TEXT, "Col 1", UI_STRING, "Col 2", UI_STRING, "Col 3", -1); | 294 UiModel* model = ui_model(obj->ctx, UI_ICON_TEXT, "Col 1", UI_STRING, "Col 2", UI_STRING, "Col 3", -1); |
| 285 model->getvalue = table_getvalue; | 295 model->getvalue = table_getvalue; |
| 286 ui_table(obj, .colspan = 3, .model = model, .list = wdata->list2, .onactivate = action_onactivate, .onselection = action_listselection_changed); | 296 ui_table(obj, .colspan = 3, .model = model, .list = wdata->list2, .onactivate = action_onactivate, |
| 297 .onselection = action_listselection_changed, .enabledrag = true, .enabledrop = true); | |
| 287 ui_model_free(obj->ctx, model); | 298 ui_model_free(obj->ctx, model); |
| 288 } | 299 } |
| 289 } | 300 } |
| 290 | 301 |
| 291 ui_show(obj); | 302 ui_show(obj); |
