comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 192
- bcacd00ea955
- parent 191
- 6113ed66d258
- child 193
- 74c688cc1839
equal
deleted
inserted
replaced
| 191:6113ed66d258 | 192:bcacd00ea955 |
|---|---|
| 36 | 36 |
| 37 typedef struct WindowData { | 37 typedef struct WindowData { |
| 38 UiInteger* check; | 38 UiInteger* check; |
| 39 UiInteger* toggle; | 39 UiInteger* toggle; |
| 40 UiInteger* radio; | 40 UiInteger* radio; |
| 41 UiString* text; | |
| 42 UiString* password; | |
| 41 } WindowData; | 43 } WindowData; |
| 42 | 44 |
| 43 void action1(UiEvent* event, void* data) { | 45 void action1(UiEvent* event, void* data) { |
| 44 char* action = data; | 46 char* action = data; |
| 45 | 47 |
| 70 WindowData* wdata = ui_malloc(obj->ctx, sizeof(WindowData)); | 72 WindowData* wdata = ui_malloc(obj->ctx, sizeof(WindowData)); |
| 71 obj->window = wdata; | 73 obj->window = wdata; |
| 72 wdata->check = ui_int_new(obj->ctx, "check"); | 74 wdata->check = ui_int_new(obj->ctx, "check"); |
| 73 wdata->toggle = ui_int_new(obj->ctx, "toggle"); | 75 wdata->toggle = ui_int_new(obj->ctx, "toggle"); |
| 74 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"); | |
| 78 wdata->password = ui_string_new(obj->ctx, "password"); | |
| 75 | 79 |
| 76 ui_grid(obj, .margin=10, .columnspacing=5, .rowspacing=20) { | 80 ui_grid(obj, .margin=10, .columnspacing=5, .rowspacing=20) { |
| 77 ui_button(obj, .label="Button1", .onclick=action1, .onclickdata="action1"); | 81 ui_button(obj, .label="Button1", .onclick=action1, .onclickdata="action1"); |
| 78 ui_button(obj, .label="Button2", .onclick=action1, .onclickdata="action2"); | 82 ui_button(obj, .label="Button2", .onclick=action1, .onclickdata="action2"); |
| 79 ui_button(obj, .label="Button3", .onclick=action1, .onclickdata="action3", .hexpand=true); | 83 ui_button(obj, .label="Button3", .onclick=action1, .onclickdata="action3", .hexpand=true); |
| 96 ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio); | 100 ui_radiobutton(obj, .label = "Radio 3", .value = wdata->radio); |
| 97 } | 101 } |
| 98 ui_newline(obj); | 102 ui_newline(obj); |
| 99 ui_radiobutton(obj, .label = "Radio 4", .value = wdata->radio); | 103 ui_radiobutton(obj, .label = "Radio 4", .value = wdata->radio); |
| 100 ui_switch(obj, .label = "test", .onchange=action_switch); | 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); | |
| 101 } | 109 } |
| 102 | 110 |
| 103 ui_show(obj); | 111 ui_show(obj); |
| 104 } | 112 } |
| 105 | 113 |
