comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 198
- f2332d0d3318
- parent 197
- 8a82ebe23822
- child 202
- 9f309d1914a2
equal
deleted
inserted
replaced
| 197:8a82ebe23822 | 198:f2332d0d3318 |
|---|---|
| 134 | 134 |
| 135 ui_textfield(obj, .value = wdata->text); | 135 ui_textfield(obj, .value = wdata->text); |
| 136 ui_passwordfield(obj, .value = wdata->password); | 136 ui_passwordfield(obj, .value = wdata->password); |
| 137 ui_newline(obj); | 137 ui_newline(obj); |
| 138 | 138 |
| 139 /* | |
| 139 ui_frame(obj, .label = "Test", .colspan = 3) { | 140 ui_frame(obj, .label = "Test", .colspan = 3) { |
| 140 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 141 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 141 } | 142 } |
| 142 ui_newline(obj); | 143 ui_newline(obj); |
| 144 */ | |
| 143 | 145 |
| 144 /* | 146 /* |
| 145 ui_expander(obj, .label = "Expand", .colspan = 3, .margin = 10, .spacing = 5, .isexpanded = false) { | 147 ui_expander(obj, .label = "Expand", .colspan = 3, .margin = 10, .spacing = 5, .isexpanded = false) { |
| 146 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 148 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 147 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 149 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 148 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 150 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 149 } | 151 } |
| 150 */ | 152 */ |
| 151 | 153 |
| 152 ui_combobox(obj, .list = wdata->list, .onselection= action_listselection_changed, .onactivate= action_onactivate); | 154 ui_combobox(obj, .list = wdata->list, .onselection= action_listselection_changed, .onactivate= action_onactivate); |
| 155 ui_newline(obj); | |
| 156 | |
| 157 ui_tabview(obj, .colspan = 3, .vexpand = true, .hexpand = true) { | |
| 158 ui_tab(obj, "Tab 1") { | |
| 159 ui_button(obj, .label = "Tab 1 Button"); | |
| 160 } | |
| 161 ui_tab(obj, "Tab 2") { | |
| 162 ui_button(obj, .label = "Tab 2 Button"); | |
| 163 } | |
| 164 } | |
| 153 } | 165 } |
| 154 } | 166 } |
| 155 | 167 |
| 156 ui_show(obj); | 168 ui_show(obj); |
| 157 } | 169 } |
