comparison: ui/motif/container.c
ui/motif/container.c
- changeset 1062
- 988665ad8dd5
- parent 1016
- ccde46662db7
equal
deleted
inserted
replaced
| 1061:3776fdc30bbe | 1062:988665ad8dd5 |
|---|---|
| 88 ctn->add(ctn, grid); | 88 ctn->add(ctn, grid); |
| 89 | 89 |
| 90 UiContainerX *container = ui_box_container(obj, grid, orientation); | 90 UiContainerX *container = ui_box_container(obj, grid, orientation); |
| 91 uic_object_push_container(obj, container); | 91 uic_object_push_container(obj, container); |
| 92 | 92 |
| 93 if(args->visibility_states) { | |
| 94 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 95 ui_widget_set_visibility_states(obj->ctx, grid, args->visibility_states, (int)nstates); | |
| 96 } | |
| 97 | |
| 93 return grid; | 98 return grid; |
| 94 } | 99 } |
| 95 | 100 |
| 96 // public | 101 // public |
| 97 UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { | 102 UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { |
| 168 Widget grid = XtCreateManagedWidget(args->name ? args->name : "gridcontainer", gridClass, parent, xargs, n); | 173 Widget grid = XtCreateManagedWidget(args->name ? args->name : "gridcontainer", gridClass, parent, xargs, n); |
| 169 ui_container_add(ctn, grid); | 174 ui_container_add(ctn, grid); |
| 170 | 175 |
| 171 UiContainerX *container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill); | 176 UiContainerX *container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill); |
| 172 uic_object_push_container(obj, container); | 177 uic_object_push_container(obj, container); |
| 178 | |
| 179 if(args->visibility_states) { | |
| 180 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 181 ui_widget_set_visibility_states(obj->ctx, grid, args->visibility_states, (int)nstates); | |
| 182 } | |
| 173 | 183 |
| 174 return grid; | 184 return grid; |
| 175 } | 185 } |
| 176 | 186 |
| 177 UiContainerX* ui_grid_container( | 187 UiContainerX* ui_grid_container( |
| 297 uic_object_remove_second_last_container(obj); | 307 uic_object_remove_second_last_container(obj); |
| 298 break; | 308 break; |
| 299 } | 309 } |
| 300 } | 310 } |
| 301 | 311 |
| 312 if(args->visibility_states) { | |
| 313 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 314 ui_widget_set_visibility_states(obj->ctx, frame, args->visibility_states, (int)nstates); | |
| 315 } | |
| 302 | 316 |
| 303 return frame; | 317 return frame; |
| 304 } | 318 } |
| 305 | 319 |
| 306 UiContainerX* ui_frame_container(UiObject *obj, Widget frame) { | 320 UiContainerX* ui_frame_container(UiObject *obj, Widget frame) { |
| 466 i->get = ui_tabview_get; | 480 i->get = ui_tabview_get; |
| 467 i->set = ui_tabview_set; | 481 i->set = ui_tabview_set; |
| 468 } | 482 } |
| 469 | 483 |
| 470 uic_object_push_container(obj, (UiContainerX*)ct); | 484 uic_object_push_container(obj, (UiContainerX*)ct); |
| 485 | |
| 486 if(args->visibility_states) { | |
| 487 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 488 ui_widget_set_visibility_states(obj->ctx, form, args->visibility_states, (int)nstates); | |
| 489 } | |
| 471 | 490 |
| 472 return form; | 491 return form; |
| 473 } | 492 } |
| 474 | 493 |
| 475 int64_t ui_tabview_get(UiInteger *i) { | 494 int64_t ui_tabview_get(UiInteger *i) { |
