comparison: ui/gtk/container.c
ui/gtk/container.c
- changeset 1063
- e0251f6e15f7
- parent 1061
- 3776fdc30bbe
equal
deleted
inserted
replaced
| 1062:988665ad8dd5 | 1063:e0251f6e15f7 |
|---|---|
| 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) { | 396 uic_widget_set_visibility_states(obj->ctx, box, 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 | 397 |
| 401 return box; | 398 return box; |
| 402 } | 399 } |
| 403 | 400 |
| 404 UIEXPORT UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { | 401 UIEXPORT UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { |
| 432 ct->add(ct, grid, &layout); | 429 ct->add(ct, grid, &layout); |
| 433 | 430 |
| 434 UiContainerX *container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill); | 431 UiContainerX *container = ui_grid_container(obj, grid, args->def_hexpand, args->def_vexpand, args->def_hfill, args->def_vfill); |
| 435 uic_object_push_container(obj, container); | 432 uic_object_push_container(obj, container); |
| 436 | 433 |
| 437 if(args->visibility_states) { | 434 uic_widget_set_visibility_states(obj->ctx, grid, 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 } | |
| 441 | 435 |
| 442 return grid; | 436 return grid; |
| 443 } | 437 } |
| 444 | 438 |
| 445 static void frame_create_subcontainer(UiObject *obj, UiFrameArgs *args) { | 439 static void frame_create_subcontainer(UiObject *obj, UiFrameArgs *args) { |
| 484 } else { | 478 } else { |
| 485 UiContainerX *container = ui_frame_container(obj, frame); | 479 UiContainerX *container = ui_frame_container(obj, frame); |
| 486 uic_object_push_container(obj, container); | 480 uic_object_push_container(obj, container); |
| 487 } | 481 } |
| 488 | 482 |
| 489 if(args->visibility_states) { | 483 uic_widget_set_visibility_states(obj->ctx, frame, 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 | 484 |
| 494 return frame; | 485 return frame; |
| 495 } | 486 } |
| 496 | 487 |
| 497 UIEXPORT UIWIDGET ui_expander_create(UiObject *obj, UiFrameArgs *args) { | 488 UIEXPORT UIWIDGET ui_expander_create(UiObject *obj, UiFrameArgs *args) { |
| 513 } else { | 504 } else { |
| 514 UiContainerX *container = ui_expander_container(obj, expander); | 505 UiContainerX *container = ui_expander_container(obj, expander); |
| 515 uic_object_push_container(obj, container); | 506 uic_object_push_container(obj, container); |
| 516 } | 507 } |
| 517 | 508 |
| 518 if(args->visibility_states) { | 509 uic_widget_set_visibility_states(obj->ctx, expander, 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 | 510 |
| 523 return expander; | 511 return expander; |
| 524 } | 512 } |
| 525 | 513 |
| 526 | 514 |
| 543 } else { | 531 } else { |
| 544 UiContainerX *container = ui_scrolledwindow_container(obj, sw); | 532 UiContainerX *container = ui_scrolledwindow_container(obj, sw); |
| 545 uic_object_push_container(obj, container); | 533 uic_object_push_container(obj, container); |
| 546 } | 534 } |
| 547 | 535 |
| 548 if(args->visibility_states) { | 536 uic_widget_set_visibility_states(obj->ctx, sw, 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); | |
| 551 } | |
| 552 | 537 |
| 553 return sw; | 538 return sw; |
| 554 } | 539 } |
| 555 | 540 |
| 556 | 541 |
| 837 ct->add(ct, widget, &layout); | 822 ct->add(ct, widget, &layout); |
| 838 | 823 |
| 839 UiContainerX *container = ui_tabview_container(obj, widget); | 824 UiContainerX *container = ui_tabview_container(obj, widget); |
| 840 uic_object_push_container(obj, container); | 825 uic_object_push_container(obj, container); |
| 841 | 826 |
| 842 if(args->visibility_states) { | 827 uic_widget_set_visibility_states(obj->ctx, widget, 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 } | |
| 846 | 828 |
| 847 return widget; | 829 return widget; |
| 848 } | 830 } |
| 849 | 831 |
| 850 static GtkWidget* create_tab(UiObject *obj, UiGtkTabView *tabview, const char *title, int tab) { | 832 static GtkWidget* create_tab(UiObject *obj, UiGtkTabView *tabview, const char *title, int tab) { |
