comparison: ui/cocoa/MainWindow.m
ui/cocoa/MainWindow.m
- changeset 826
- e596cfc1ca46
- parent 811
- 1391ba7e533f
- child 846
- ffa983c223c1
equal
deleted
inserted
replaced
| 811:1391ba7e533f | 826:e596cfc1ca46 |
|---|---|
| 29 #import "MainWindow.h" | 29 #import "MainWindow.h" |
| 30 #import "Container.h" | 30 #import "Container.h" |
| 31 #import "GridLayout.h" | 31 #import "GridLayout.h" |
| 32 #import "BoxContainer.h" | 32 #import "BoxContainer.h" |
| 33 #import "../common/object.h" | 33 #import "../common/object.h" |
| 34 #import "../ui/properties.h" | |
| 34 #import <objc/runtime.h> | 35 #import <objc/runtime.h> |
| 35 | 36 |
| 36 #import "EventData.h" | 37 #import "EventData.h" |
| 37 #import "menu.h" | 38 #import "menu.h" |
| 38 #import "Toolbar.h" | 39 #import "Toolbar.h" |
| 82 top = 34; | 83 top = 34; |
| 83 } | 84 } |
| 84 | 85 |
| 85 if(hasSidebar) { | 86 if(hasSidebar) { |
| 86 // add the sidebar | 87 // add the sidebar |
| 87 _sidebar = [[NSView alloc]initWithFrame:NSMakeRect(0,0,0,0)]; | 88 const char *sidebarMaterialProperty = ui_get_property("ui.cocoa.sidebar.usematerial"); |
| 89 BOOL useMaterial = YES; | |
| 90 if(sidebarMaterialProperty && (sidebarMaterialProperty[0] == 'f' || sidebarMaterialProperty[0] == 'F')) { | |
| 91 useMaterial = NO; | |
| 92 } | |
| 93 | |
| 94 if(useMaterial) { | |
| 95 NSVisualEffectView *v = [[NSVisualEffectView alloc] initWithFrame:NSMakeRect(0,0,0,0)]; | |
| 96 v.material = NSVisualEffectMaterialSidebar; | |
| 97 v.blendingMode = NSVisualEffectBlendingModeBehindWindow; | |
| 98 v.state = NSVisualEffectStateActive; | |
| 99 _sidebar = v; | |
| 100 } else { | |
| 101 _sidebar = [[NSView alloc]initWithFrame:NSMakeRect(0,0,0,0)]; | |
| 102 } | |
| 88 _sidebar.translatesAutoresizingMaskIntoConstraints = NO; | 103 _sidebar.translatesAutoresizingMaskIntoConstraints = NO; |
| 89 [splitview addArrangedSubview:_sidebar]; | 104 [splitview addArrangedSubview:_sidebar]; |
| 90 [_sidebar.widthAnchor constraintGreaterThanOrEqualToConstant:250].active = YES; | 105 [_sidebar.widthAnchor constraintGreaterThanOrEqualToConstant:250].active = YES; |
| 91 } | 106 } |
| 92 if(hasSplitview) { | 107 if(hasSplitview) { |
