comparison: ui/gtk/container.c
ui/gtk/container.c
- changeset 1061
- 3776fdc30bbe
- parent 1050
- dee2ca687a14
equal
deleted
inserted
replaced
| 1060:74bed80a0503 | 1061:3776fdc30bbe |
|---|---|
| 391 ct->add(ct, box, &layout); | 391 ct->add(ct, box, &layout); |
| 392 | 392 |
| 393 UiContainerX *container = ui_box_container(obj, box, type); | 393 UiContainerX *container = ui_box_container(obj, box, type); |
| 394 uic_object_push_container(obj, container); | 394 uic_object_push_container(obj, container); |
| 395 | 395 |
| 396 if(args->visibility_states) { | |
| 397 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 398 ui_widget_set_visibility_states(obj->ctx, box, args->visibility_states, (int)nstates); | |
| 399 } | |
| 400 | |
| 396 return box; | 401 return box; |
| 397 } | 402 } |
| 398 | 403 |
| 399 UIEXPORT UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { | 404 UIEXPORT UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { |
| 400 return ui_box_create(obj, args, UI_CONTAINER_VBOX); | 405 return ui_box_create(obj, args, UI_CONTAINER_VBOX); |
| 426 ui_set_name_and_style(grid, args->name, args->style_class); | 431 ui_set_name_and_style(grid, args->name, args->style_class); |
| 427 ct->add(ct, grid, &layout); | 432 ct->add(ct, grid, &layout); |
| 428 | 433 |
| 429 UiContainerX *container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill); | 434 UiContainerX *container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill); |
| 430 uic_object_push_container(obj, container); | 435 uic_object_push_container(obj, container); |
| 436 | |
| 437 if(args->visibility_states) { | |
| 438 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 439 ui_widget_set_visibility_states(obj->ctx, grid, args->visibility_states, (int)nstates); | |
| 440 } | |
| 431 | 441 |
| 432 return grid; | 442 return grid; |
| 433 } | 443 } |
| 434 | 444 |
| 435 static void frame_create_subcontainer(UiObject *obj, UiFrameArgs *args) { | 445 static void frame_create_subcontainer(UiObject *obj, UiFrameArgs *args) { |
| 474 } else { | 484 } else { |
| 475 UiContainerX *container = ui_frame_container(obj, frame); | 485 UiContainerX *container = ui_frame_container(obj, frame); |
| 476 uic_object_push_container(obj, container); | 486 uic_object_push_container(obj, container); |
| 477 } | 487 } |
| 478 | 488 |
| 489 if(args->visibility_states) { | |
| 490 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 491 ui_widget_set_visibility_states(obj->ctx, frame, args->visibility_states, (int)nstates); | |
| 492 } | |
| 493 | |
| 479 return frame; | 494 return frame; |
| 480 } | 495 } |
| 481 | 496 |
| 482 UIEXPORT UIWIDGET ui_expander_create(UiObject *obj, UiFrameArgs *args) { | 497 UIEXPORT UIWIDGET ui_expander_create(UiObject *obj, UiFrameArgs *args) { |
| 483 UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end; | 498 UiContainerPrivate *ct = (UiContainerPrivate*)obj->container_end; |
| 498 } else { | 513 } else { |
| 499 UiContainerX *container = ui_expander_container(obj, expander); | 514 UiContainerX *container = ui_expander_container(obj, expander); |
| 500 uic_object_push_container(obj, container); | 515 uic_object_push_container(obj, container); |
| 501 } | 516 } |
| 502 | 517 |
| 518 if(args->visibility_states) { | |
| 519 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 520 ui_widget_set_visibility_states(obj->ctx, expander, args->visibility_states, (int)nstates); | |
| 521 } | |
| 522 | |
| 503 return expander; | 523 return expander; |
| 504 } | 524 } |
| 505 | 525 |
| 506 | 526 |
| 507 UIWIDGET ui_scrolledwindow_create(UiObject* obj, UiFrameArgs *args) { | 527 UIWIDGET ui_scrolledwindow_create(UiObject* obj, UiFrameArgs *args) { |
| 521 if(sub) { | 541 if(sub) { |
| 522 SCROLLEDWINDOW_SET_CHILD(sw, sub); | 542 SCROLLEDWINDOW_SET_CHILD(sw, sub); |
| 523 } else { | 543 } else { |
| 524 UiContainerX *container = ui_scrolledwindow_container(obj, sw); | 544 UiContainerX *container = ui_scrolledwindow_container(obj, sw); |
| 525 uic_object_push_container(obj, container); | 545 uic_object_push_container(obj, container); |
| 546 } | |
| 547 | |
| 548 if(args->visibility_states) { | |
| 549 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 550 ui_widget_set_visibility_states(obj->ctx, sw, args->visibility_states, (int)nstates); | |
| 526 } | 551 } |
| 527 | 552 |
| 528 return sw; | 553 return sw; |
| 529 } | 554 } |
| 530 | 555 |
| 811 UiLayout layout = UI_ARGS2LAYOUT(args); | 836 UiLayout layout = UI_ARGS2LAYOUT(args); |
| 812 ct->add(ct, widget, &layout); | 837 ct->add(ct, widget, &layout); |
| 813 | 838 |
| 814 UiContainerX *container = ui_tabview_container(obj, widget); | 839 UiContainerX *container = ui_tabview_container(obj, widget); |
| 815 uic_object_push_container(obj, container); | 840 uic_object_push_container(obj, container); |
| 841 | |
| 842 if(args->visibility_states) { | |
| 843 size_t nstates = uic_state_array_size(args->visibility_states); | |
| 844 ui_widget_set_visibility_states(obj->ctx, widget, args->visibility_states, (int)nstates); | |
| 845 } | |
| 816 | 846 |
| 817 return widget; | 847 return widget; |
| 818 } | 848 } |
| 819 | 849 |
| 820 static GtkWidget* create_tab(UiObject *obj, UiGtkTabView *tabview, const char *title, int tab) { | 850 static GtkWidget* create_tab(UiObject *obj, UiGtkTabView *tabview, const char *title, int tab) { |
