comparison: make/vs/testapp/main.c
make/vs/testapp/main.c
- branch
- newapi
- changeset 215
- 1bd5534c395d
- parent 214
- 279c0c81d3b1
- child 216
- 391c2c723029
equal
deleted
inserted
replaced
| 214:279c0c81d3b1 | 215:1bd5534c395d |
|---|---|
| 46 UiString* t3; | 46 UiString* t3; |
| 47 UiList* list2; | 47 UiList* list2; |
| 48 UiList* list3; | 48 UiList* list3; |
| 49 } WindowData; | 49 } WindowData; |
| 50 | 50 |
| 51 static UiIcon* folder_icon; | |
| 52 | |
| 51 void action1(UiEvent* event, void* data) { | 53 void action1(UiEvent* event, void* data) { |
| 52 char* action = data; | 54 char* action = data; |
| 53 | 55 |
| 54 WindowData* wdata = event->window; | 56 WindowData* wdata = event->window; |
| 55 int64_t is_checked = wdata->check->get(wdata->check); | 57 int64_t is_checked = wdata->check->get(wdata->check); |
| 103 } TableData; | 105 } TableData; |
| 104 | 106 |
| 105 void* table_getvalue(void* data, int i) { | 107 void* table_getvalue(void* data, int i) { |
| 106 TableData* t = data; | 108 TableData* t = data; |
| 107 switch (i) { | 109 switch (i) { |
| 108 case 0: return t->col1; | 110 case 0: return folder_icon; |
| 109 case 1: return t->col2; | 111 case 1: return t->col1; |
| 110 case 2: return t->col3; | 112 case 2: return t->col2; |
| 113 case 3: return t->col3; | |
| 111 } | 114 } |
| 112 return NULL; | 115 return NULL; |
| 113 } | 116 } |
| 114 | 117 |
| 115 void action_add(UiEvent* event, void* data) { | 118 void action_add(UiEvent* event, void* data) { |
| 158 ui_list_append(wdata->list3, "usr"); | 161 ui_list_append(wdata->list3, "usr"); |
| 159 ui_list_append(wdata->list3, "share"); | 162 ui_list_append(wdata->list3, "share"); |
| 160 ui_list_append(wdata->list3, "test"); | 163 ui_list_append(wdata->list3, "test"); |
| 161 ui_list_append(wdata->list3, "dir"); | 164 ui_list_append(wdata->list3, "dir"); |
| 162 | 165 |
| 166 folder_icon = ui_icon("Folder", 32); | |
| 163 | 167 |
| 164 TableData* td1 = malloc(sizeof(TableData)); | 168 TableData* td1 = malloc(sizeof(TableData)); |
| 165 TableData* td2 = malloc(sizeof(TableData)); | 169 TableData* td2 = malloc(sizeof(TableData)); |
| 166 TableData* td3 = malloc(sizeof(TableData)); | 170 TableData* td3 = malloc(sizeof(TableData)); |
| 167 TableData* td4 = malloc(sizeof(TableData)); | 171 TableData* td4 = malloc(sizeof(TableData)); |
| 261 ui_newline(obj); | 265 ui_newline(obj); |
| 262 | 266 |
| 263 | 267 |
| 264 ui_newline(obj); | 268 ui_newline(obj); |
| 265 | 269 |
| 266 UiModel* model = ui_model(obj->ctx, UI_STRING, "Col 1", UI_STRING, "Col 2", UI_STRING, "Col 3", -1); | 270 UiModel* model = ui_model(obj->ctx, UI_ICON_TEXT, "Col 1", UI_STRING, "Col 2", UI_STRING, "Col 3", -1); |
| 267 model->getvalue = table_getvalue; | 271 model->getvalue = table_getvalue; |
| 268 ui_table(obj, .colspan = 3, .model = model, .list = wdata->list2); | 272 ui_table(obj, .colspan = 3, .model = model, .list = wdata->list2); |
| 269 ui_model_free(obj->ctx, model); | 273 ui_model_free(obj->ctx, model); |
| 270 } | 274 } |
| 271 } | 275 } |
