comparison: ui/cocoa/container.m
ui/cocoa/container.m
- changeset 1229
- 4f897819ae05
- parent 1163
- a32411b88442
equal
deleted
inserted
replaced
| 1228:204677c47576 | 1229:4f897819ae05 |
|---|---|
| 43 ui_container_add(obj, box, &layout); | 43 ui_container_add(obj, box, &layout); |
| 44 | 44 |
| 45 // add new box to the obj container chain | 45 // add new box to the obj container chain |
| 46 uic_object_push_container(obj, container); | 46 uic_object_push_container(obj, container); |
| 47 | 47 |
| 48 return (__bridge void*)box; | 48 void *widget = (__bridge void*)box; |
| 49 uic_widget_set_visibility_states(obj->ctx, widget, args->visibility_states); | |
| 50 | |
| 51 return widget; | |
| 49 } | 52 } |
| 50 | 53 |
| 51 UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { | 54 UIWIDGET ui_vbox_create(UiObject *obj, UiContainerArgs *args) { |
| 52 return ui_box_create(obj, args, NSUserInterfaceLayoutOrientationVertical); | 55 return ui_box_create(obj, args, NSUserInterfaceLayoutOrientationVertical); |
| 53 } | 56 } |
| 69 ui_container_add(obj, grid, &layout); | 72 ui_container_add(obj, grid, &layout); |
| 70 | 73 |
| 71 // add new box to the obj container chain | 74 // add new box to the obj container chain |
| 72 uic_object_push_container(obj, container); | 75 uic_object_push_container(obj, container); |
| 73 | 76 |
| 74 return (__bridge void*)grid; | 77 void *widget = (__bridge void*)grid; |
| 78 uic_widget_set_visibility_states(obj->ctx, widget, args->visibility_states); | |
| 79 | |
| 80 return widget; | |
| 75 } | 81 } |
| 76 | 82 |
| 77 UIWIDGET ui_frame_create(UiObject *obj, UiFrameArgs *args) { | 83 UIWIDGET ui_frame_create(UiObject *obj, UiFrameArgs *args) { |
| 78 NSString *title = args->label ? [[NSString alloc]initWithUTF8String:args->label] : nil; | 84 NSString *title = args->label ? [[NSString alloc]initWithUTF8String:args->label] : nil; |
| 79 FrameContainer *frame = [[FrameContainer alloc] init:title]; | 85 FrameContainer *frame = [[FrameContainer alloc] init:title]; |
| 114 } | 120 } |
| 115 } | 121 } |
| 116 | 122 |
| 117 uic_object_push_container(obj, container); | 123 uic_object_push_container(obj, container); |
| 118 | 124 |
| 119 return (__bridge void*)frame; | 125 void *widget = (__bridge void*)frame; |
| 126 uic_widget_set_visibility_states(obj->ctx, widget, args->visibility_states); | |
| 127 | |
| 128 return widget; | |
| 120 } | 129 } |
| 121 | 130 |
| 122 UIWIDGET ui_expander_create(UiObject *obj, UiFrameArgs *args) { | 131 UIWIDGET ui_expander_create(UiObject *obj, UiFrameArgs *args) { |
| 123 return ui_frame_create(obj, args); // TODO | 132 return ui_frame_create(obj, args); // TODO |
| 124 } | 133 } |
| 138 ui_container_add(obj, scrollview, &layout); | 147 ui_container_add(obj, scrollview, &layout); |
| 139 | 148 |
| 140 UiContainer *container = ui_create_container(obj, scrollview); | 149 UiContainer *container = ui_create_container(obj, scrollview); |
| 141 uic_object_push_container(obj, container); | 150 uic_object_push_container(obj, container); |
| 142 | 151 |
| 143 return (__bridge void*)scrollview; | 152 void *widget = (__bridge void*)scrollview; |
| 153 uic_widget_set_visibility_states(obj->ctx, widget, args->visibility_states); | |
| 154 | |
| 155 return widget; | |
| 144 } | 156 } |
| 145 | 157 |
| 146 static int64_t tabview_get(UiInteger *i) { | 158 static int64_t tabview_get(UiInteger *i) { |
| 147 NSView<TabView, Container> *tabview = (__bridge id)i->obj; | 159 NSView<TabView, Container> *tabview = (__bridge id)i->obj; |
| 148 return 0; | 160 return 0; |
| 163 ui_container_add(obj, tabview, &layout); | 175 ui_container_add(obj, tabview, &layout); |
| 164 | 176 |
| 165 UiContainer *container = ui_create_container(obj, tabview); | 177 UiContainer *container = ui_create_container(obj, tabview); |
| 166 uic_object_push_container(obj, container); | 178 uic_object_push_container(obj, container); |
| 167 | 179 |
| 168 return (__bridge void*)tabview; | 180 void *widget = (__bridge void*)tabview; |
| 181 uic_widget_set_visibility_states(obj->ctx, widget, args->visibility_states); | |
| 182 | |
| 183 return widget; | |
| 169 } | 184 } |
| 170 | 185 |
| 171 void ui_tab_create(UiObject *obj, const char* title) { | 186 void ui_tab_create(UiObject *obj, const char* title) { |
| 172 UiContainer *ctn = obj->container_end; | 187 UiContainer *ctn = obj->container_end; |
| 173 id<TabView> tabview = (__bridge id<TabView>)ctn->container; | 188 id<TabView> tabview = (__bridge id<TabView>)ctn->container; |
