comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 202
- 9f309d1914a2
- parent 198
- f2332d0d3318
- child 203
- 0e94be3d9722
equal
deleted
inserted
replaced
| 201:7f67ebbb0c1c | 202:9f309d1914a2 |
|---|---|
| 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 /* | |
| 140 ui_frame(obj, .label = "Test", .colspan = 3) { | 139 ui_frame(obj, .label = "Test", .colspan = 3) { |
| 141 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 140 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 142 } | 141 } |
| 143 ui_newline(obj); | 142 ui_newline(obj); |
| 144 */ | 143 |
| 145 | |
| 146 /* | |
| 147 ui_expander(obj, .label = "Expand", .colspan = 3, .margin = 10, .spacing = 5, .isexpanded = false) { | 144 ui_expander(obj, .label = "Expand", .colspan = 3, .margin = 10, .spacing = 5, .isexpanded = false) { |
| 148 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 145 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 149 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 146 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 150 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); | 147 ui_button(obj, .label = "Button1", .onclick = action1, .onclickdata = "action1"); |
| 151 } | 148 } |
| 152 */ | 149 ui_newline(obj); |
| 153 | 150 |
| 154 ui_combobox(obj, .list = wdata->list, .onselection= action_listselection_changed, .onactivate= action_onactivate); | 151 ui_combobox(obj, .list = wdata->list, .onselection= action_listselection_changed, .onactivate= action_onactivate); |
| 155 ui_newline(obj); | 152 ui_newline(obj); |
| 156 | 153 |
| 157 ui_tabview(obj, .colspan = 3, .vexpand = true, .hexpand = true) { | 154 ui_tabview(obj, .colspan = 3, .vexpand = true, .hexpand = true, .tabview = UI_TABVIEW_NAVIGATION_TOP2) { |
| 158 ui_tab(obj, "Tab 1") { | 155 ui_tab(obj, "Tab 1") { |
| 159 ui_button(obj, .label = "Tab 1 Button"); | 156 ui_button(obj, .label = "Tab 1 Button"); |
| 160 } | 157 } |
| 161 ui_tab(obj, "Tab 2") { | 158 ui_tab(obj, "Tab 2") { |
| 162 ui_button(obj, .label = "Tab 2 Button"); | 159 ui_button(obj, .label = "Tab 2 Button"); |
