comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 190
- 70fd1b24e395
- parent 189
- 4daddc326877
- child 191
- 6113ed66d258
equal
deleted
inserted
replaced
| 189:4daddc326877 | 190:70fd1b24e395 |
|---|---|
| 67 obj->window = wdata; | 67 obj->window = wdata; |
| 68 wdata->check = ui_int_new(obj->ctx, "check"); | 68 wdata->check = ui_int_new(obj->ctx, "check"); |
| 69 wdata->toggle = ui_int_new(obj->ctx, "toggle"); | 69 wdata->toggle = ui_int_new(obj->ctx, "toggle"); |
| 70 wdata->radio = ui_int_new(obj->ctx, "radio"); | 70 wdata->radio = ui_int_new(obj->ctx, "radio"); |
| 71 | 71 |
| 72 UI_GRID_SP(obj, 10, 5, 20) { | 72 ui_grid(obj, .margin=10, .columnspacing=5, .rowspacing=20) { |
| 73 ui_button(obj, .label="Button1", .onclick=action1, .onclickdata="action1"); | 73 ui_button(obj, .label="Button1", .onclick=action1, .onclickdata="action1"); |
| 74 ui_button(obj, .label="Button2", .onclick=action1, .onclickdata="action2"); | 74 ui_button(obj, .label="Button2", .onclick=action1, .onclickdata="action2"); |
| 75 ui_button(obj, .label="Button3", .onclick=action1, .onclickdata="action3", .hexpand=true); | 75 ui_button(obj, .label="Button3", .onclick=action1, .onclickdata="action3", .hexpand=true); |
| 76 ui_newline(obj); | 76 ui_newline(obj); |
| 77 | 77 |
| 84 | 84 |
| 85 ui_checkbox(obj, .label = "Option 1", .value = wdata->check, .onchange=action_onchange); | 85 ui_checkbox(obj, .label = "Option 1", .value = wdata->check, .onchange=action_onchange); |
| 86 ui_togglebutton(obj, .label = "Option 2", .value = wdata->toggle); | 86 ui_togglebutton(obj, .label = "Option 2", .value = wdata->toggle); |
| 87 ui_newline(obj); | 87 ui_newline(obj); |
| 88 | 88 |
| 89 ui_layout_colspan(obj, 3); | 89 ui_hbox(obj, .colspan=3) { |
| 90 UI_HBOX(obj) { | |
| 91 ui_radiobutton(obj, .label = "Radio 1", .value = wdata->radio); | 90 ui_radiobutton(obj, .label = "Radio 1", .value = wdata->radio); |
| 92 ui_radiobutton(obj, .label = "Radio 2", .value = wdata->radio); | 91 ui_radiobutton(obj, .label = "Radio 2", .value = wdata->radio); |
| 93 ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio); | 92 ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio); |
| 94 } | 93 } |
| 95 ui_newline(obj); | 94 ui_newline(obj); |
