comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 194
- e2281ace0769
- parent 193
- 74c688cc1839
- child 195
- 0f2e69873875
equal
deleted
inserted
replaced
| 193:74c688cc1839 | 194:e2281ace0769 |
|---|---|
| 75 wdata->toggle = ui_int_new(obj->ctx, "toggle"); | 75 wdata->toggle = ui_int_new(obj->ctx, "toggle"); |
| 76 wdata->radio = ui_int_new(obj->ctx, "radio"); | 76 wdata->radio = ui_int_new(obj->ctx, "radio"); |
| 77 wdata->text = ui_string_new(obj->ctx, "text"); | 77 wdata->text = ui_string_new(obj->ctx, "text"); |
| 78 wdata->password = ui_string_new(obj->ctx, "password"); | 78 wdata->password = ui_string_new(obj->ctx, "password"); |
| 79 | 79 |
| 80 ui_grid(obj, .margin=10, .columnspacing=5, .rowspacing=20) { | 80 ui_scrolledwindow0(obj) { |
| 81 ui_button(obj, .label="Button1", .onclick=action1, .onclickdata="action1"); | 81 ui_grid(obj, .margin = 10, .columnspacing = 5, .rowspacing = 20) { |
| 82 ui_button(obj, .label="Button2", .onclick=action1, .onclickdata="action2"); | 82 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 83 ui_button(obj, .label="Button3", .onclick=action1, .onclickdata="action3", .hexpand=true); | 83 ui_button(obj, .label = "Button2", .onclick = action1, .onclickdata = "action2"); |
| 84 ui_newline(obj); | 84 ui_button(obj, .label = "Button3", .onclick = action1, .onclickdata = "action3", .hexpand = true); |
| 85 ui_newline(obj); | |
| 85 | 86 |
| 86 ui_button(obj, .label="Button4", .onclick=action1, .onclickdata="action4"); | 87 ui_button(obj, .label = "Button4", .onclick = action1, .onclickdata = "action4"); |
| 87 ui_button(obj, .label="Button5", .onclick=action1, .onclickdata="action5", .colspan=2); | 88 ui_button(obj, .label = "Button5", .onclick = action1, .onclickdata = "action5", .colspan = 2); |
| 88 ui_newline(obj); | 89 ui_newline(obj); |
| 89 | 90 |
| 90 ui_button(obj, .label="Very Long Button Label Text ____________ Test", .onclick=action_set_checkbox); | 91 ui_button(obj, .label = "Very Long Button Label Text ____________ Test", .onclick = action_set_checkbox); |
| 91 ui_newline(obj); | 92 ui_newline(obj); |
| 92 | 93 |
| 93 ui_checkbox(obj, .label = "Option 1", .value = wdata->check, .onchange=action_onchange); | 94 ui_checkbox(obj, .label = "Option 1", .value = wdata->check, .onchange = action_onchange); |
| 94 ui_togglebutton(obj, .label = "Option 2", .value = wdata->toggle); | 95 ui_togglebutton(obj, .label = "Option 2", .value = wdata->toggle); |
| 95 ui_newline(obj); | 96 ui_newline(obj); |
| 96 | 97 |
| 97 ui_hbox(obj, .colspan=3) { | 98 ui_hbox(obj, .colspan = 3) { |
| 98 ui_radiobutton(obj, .label = "Radio 1", .value = wdata->radio); | 99 ui_radiobutton(obj, .label = "Radio 1", .value = wdata->radio); |
| 99 ui_radiobutton(obj, .label = "Radio 2", .value = wdata->radio); | 100 ui_radiobutton(obj, .label = "Radio 2", .value = wdata->radio); |
| 100 ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio); | 101 ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio); |
| 102 } | |
| 103 ui_newline(obj); | |
| 104 ui_radiobutton(obj, .label = "Radio 4", .value = wdata->radio); | |
| 105 ui_switch(obj, .label = "test", .onchange = action_switch); | |
| 106 ui_newline(obj); | |
| 107 | |
| 108 ui_textfield(obj, .value = wdata->text); | |
| 109 ui_passwordfield(obj, .value = wdata->password); | |
| 110 ui_newline(obj); | |
| 111 | |
| 112 ui_frame(obj, .label = "Test", .colspan = 3, .vexpand = true) { | |
| 113 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | |
| 114 } | |
| 101 } | 115 } |
| 102 ui_newline(obj); | 116 } |
| 103 ui_radiobutton(obj, .label = "Radio 4", .value = wdata->radio); | |
| 104 ui_switch(obj, .label = "test", .onchange=action_switch); | |
| 105 ui_newline(obj); | |
| 106 | |
| 107 ui_textfield(obj, .value = wdata->text); | |
| 108 ui_passwordfield(obj, .value = wdata->password); | |
| 109 ui_newline(obj); | |
| 110 | |
| 111 ui_frame(obj, .label = "Test", .colspan = 3, .vexpand = true) { | |
| 112 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | |
| 113 } | |
| 114 } | |
| 115 | 117 |
| 116 ui_show(obj); | 118 ui_show(obj); |
| 117 } | 119 } |
| 118 | 120 |
| 119 | 121 |
