comparison: ui/cocoa/container.m
ui/cocoa/container.m
- changeset 110
- c00e968d018b
- parent 109
- c3dfcb8f0be7
- child 112
- c3f2f16fa4b8
equal
deleted
inserted
replaced
| 109:c3dfcb8f0be7 | 110:c00e968d018b |
|---|---|
| 26 * POSSIBILITY OF SUCH DAMAGE. | 26 * POSSIBILITY OF SUCH DAMAGE. |
| 27 */ | 27 */ |
| 28 | 28 |
| 29 #import "Container.h" | 29 #import "Container.h" |
| 30 #import "GridLayout.h" | 30 #import "GridLayout.h" |
| 31 #import "BoxContainer.h" | |
| 31 | 32 |
| 32 /* ------------------------- container classes ------------------------- */ | 33 /* ------------------------- container classes ------------------------- */ |
| 33 | 34 |
| 35 /* | |
| 34 @implementation BoxContainer | 36 @implementation BoxContainer |
| 35 | 37 |
| 36 @synthesize label=_label; | 38 @synthesize label=_label; |
| 37 @synthesize uilayout=_uilayout; | 39 @synthesize uilayout=_uilayout; |
| 38 @synthesize newline=_newline; | 40 @synthesize newline=_newline; |
| 86 // at the moment, only the fill layout option needs to be reset | 88 // at the moment, only the fill layout option needs to be reset |
| 87 _uilayout.fill = UI_DEFAULT; | 89 _uilayout.fill = UI_DEFAULT; |
| 88 } | 90 } |
| 89 | 91 |
| 90 @end | 92 @end |
| 91 | 93 */ |
| 92 | 94 |
| 93 | 95 |
| 94 /* -------------------- public container functions --------------------- */ | 96 /* -------------------- public container functions --------------------- */ |
| 95 | 97 |
| 96 static UIWIDGET ui_box_create(UiObject *obj, UiContainerArgs *args, NSUserInterfaceLayoutOrientation orientation) { | 98 static UIWIDGET ui_box_create(UiObject *obj, UiContainerArgs *args, NSUserInterfaceLayoutOrientation orientation) { |
| 126 // add new box to the obj container chain | 128 // add new box to the obj container chain |
| 127 uic_object_push_container(obj, ui_create_container(obj, grid)); | 129 uic_object_push_container(obj, ui_create_container(obj, grid)); |
| 128 | 130 |
| 129 return (__bridge void*)grid; | 131 return (__bridge void*)grid; |
| 130 } | 132 } |
| 131 | |
| 132 | 133 |
| 133 void ui_container_begin_close(UiObject *obj) { | 134 void ui_container_begin_close(UiObject *obj) { |
| 134 UiContainerX *ct = obj->container_end; | 135 UiContainerX *ct = obj->container_end; |
| 135 ct->close = 1; | 136 ct->close = 1; |
| 136 } | 137 } |
