comparison: ui/cocoa/MainWindow.m
ui/cocoa/MainWindow.m
- changeset 846
- ffa983c223c1
- parent 826
- e596cfc1ca46
- child 864
- d39301e8f962
equal
deleted
inserted
replaced
| 845:f3ab28ed22e5 | 846:ffa983c223c1 |
|---|---|
| 127 [vbox.topAnchor constraintEqualToAnchor:content.topAnchor constant:top], | 127 [vbox.topAnchor constraintEqualToAnchor:content.topAnchor constant:top], |
| 128 [vbox.leadingAnchor constraintEqualToAnchor:content.leadingAnchor], | 128 [vbox.leadingAnchor constraintEqualToAnchor:content.leadingAnchor], |
| 129 [vbox.trailingAnchor constraintEqualToAnchor:content.trailingAnchor], | 129 [vbox.trailingAnchor constraintEqualToAnchor:content.trailingAnchor], |
| 130 [vbox.bottomAnchor constraintEqualToAnchor:content.bottomAnchor], | 130 [vbox.bottomAnchor constraintEqualToAnchor:content.bottomAnchor], |
| 131 ]]; | 131 ]]; |
| 132 uic_object_push_container(obj, ui_create_container(obj, vbox)); | 132 UiContainerX *container = ui_create_container(obj, vbox); |
| 133 vbox.container = container; | |
| 134 uic_object_push_container(obj, container); | |
| 133 } | 135 } |
| 134 _topOffset = top; | 136 _topOffset = top; |
| 135 | 137 |
| 136 return self; | 138 return self; |
| 137 } | 139 } |
| 345 } | 347 } |
| 346 NSView *sidebar = window.sidebar; | 348 NSView *sidebar = window.sidebar; |
| 347 | 349 |
| 348 // create a vertical stackview as default container | 350 // create a vertical stackview as default container |
| 349 BoxContainer *vbox = [[BoxContainer alloc] init:NSUserInterfaceLayoutOrientationVertical spacing:args->spacing]; | 351 BoxContainer *vbox = [[BoxContainer alloc] init:NSUserInterfaceLayoutOrientationVertical spacing:args->spacing]; |
| 352 vbox.container = ui_create_container(obj, vbox); | |
| 350 //GridLayout *vbox = [[GridLayout alloc] init]; | 353 //GridLayout *vbox = [[GridLayout alloc] init]; |
| 351 vbox.translatesAutoresizingMaskIntoConstraints = false; | 354 vbox.translatesAutoresizingMaskIntoConstraints = false; |
| 352 [sidebar addSubview:vbox]; | 355 [sidebar addSubview:vbox]; |
| 353 [NSLayoutConstraint activateConstraints:@[ | 356 [NSLayoutConstraint activateConstraints:@[ |
| 354 [vbox.topAnchor constraintEqualToAnchor:sidebar.topAnchor constant:34], | 357 [vbox.topAnchor constraintEqualToAnchor:sidebar.topAnchor constant:34], |
| 355 [vbox.leadingAnchor constraintEqualToAnchor:sidebar.leadingAnchor], | 358 [vbox.leadingAnchor constraintEqualToAnchor:sidebar.leadingAnchor], |
| 356 [vbox.trailingAnchor constraintEqualToAnchor:sidebar.trailingAnchor], | 359 [vbox.trailingAnchor constraintEqualToAnchor:sidebar.trailingAnchor], |
| 357 [vbox.bottomAnchor constraintEqualToAnchor:sidebar.bottomAnchor] | 360 [vbox.bottomAnchor constraintEqualToAnchor:sidebar.bottomAnchor] |
| 358 ]]; | 361 ]]; |
| 359 uic_object_push_container(obj, ui_create_container(obj, vbox)); | 362 uic_object_push_container(obj, vbox.container); |
| 360 | 363 |
| 361 return NULL; | 364 return NULL; |
| 362 } | 365 } |
| 363 | 366 |
| 364 static UIWIDGET splitview_window_add_panel(UiObject *obj, NSView *panel, UiSidebarArgs *args) { | 367 static UIWIDGET splitview_window_add_panel(UiObject *obj, NSView *panel, UiSidebarArgs *args) { |
| 365 MainWindow *window = (__bridge MainWindow*)obj->wobj; | 368 MainWindow *window = (__bridge MainWindow*)obj->wobj; |
| 366 BoxContainer *vbox = [[BoxContainer alloc] init:NSUserInterfaceLayoutOrientationVertical spacing:0]; | 369 BoxContainer *vbox = [[BoxContainer alloc] init:NSUserInterfaceLayoutOrientationVertical spacing:0]; |
| 367 //GridLayout *vbox = [[GridLayout alloc] init]; | 370 //GridLayout *vbox = [[GridLayout alloc] init]; |
| 371 vbox.container = ui_create_container(obj, vbox); | |
| 368 vbox.translatesAutoresizingMaskIntoConstraints = false; | 372 vbox.translatesAutoresizingMaskIntoConstraints = false; |
| 369 [panel addSubview:vbox]; | 373 [panel addSubview:vbox]; |
| 370 [NSLayoutConstraint activateConstraints:@[ | 374 [NSLayoutConstraint activateConstraints:@[ |
| 371 [vbox.topAnchor constraintEqualToAnchor:panel.topAnchor constant:window.topOffset], | 375 [vbox.topAnchor constraintEqualToAnchor:panel.topAnchor constant:window.topOffset], |
| 372 [vbox.leadingAnchor constraintEqualToAnchor:panel.leadingAnchor], | 376 [vbox.leadingAnchor constraintEqualToAnchor:panel.leadingAnchor], |
| 373 [vbox.trailingAnchor constraintEqualToAnchor:panel.trailingAnchor], | 377 [vbox.trailingAnchor constraintEqualToAnchor:panel.trailingAnchor], |
| 374 [vbox.bottomAnchor constraintEqualToAnchor:panel.bottomAnchor], | 378 [vbox.bottomAnchor constraintEqualToAnchor:panel.bottomAnchor], |
| 375 ]]; | 379 ]]; |
| 376 uic_object_push_container(obj, ui_create_container(obj, vbox)); | 380 uic_object_push_container(obj, vbox.container); |
| 377 return (__bridge void*)vbox; | 381 return (__bridge void*)vbox; |
| 378 } | 382 } |
| 379 | 383 |
| 380 UIWIDGET ui_left_panel_create(UiObject *obj, UiSidebarArgs *args) { | 384 UIWIDGET ui_left_panel_create(UiObject *obj, UiSidebarArgs *args) { |
| 381 MainWindow *window = (__bridge MainWindow*)obj->wobj; | 385 MainWindow *window = (__bridge MainWindow*)obj->wobj; |
