merge

Fri, 10 Oct 2025 09:06:06 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 10 Oct 2025 09:06:06 +0200
changeset 827
eae5b817aa47
parent 826
e596cfc1ca46 (diff)
parent 825
1bac7e45712b (current diff)
child 828
a952337ae325

merge

--- a/make/xcode/toolkit/toolkit/main.m	Thu Oct 09 18:49:19 2025 +0200
+++ b/make/xcode/toolkit/toolkit/main.m	Fri Oct 10 09:06:06 2025 +0200
@@ -108,8 +108,8 @@
     
     ui_sidebar(obj) {
         ui_vbox(obj, .margin = 0, .fill = TRUE) {
-            //ui_button(obj, .label = "Button");
-            ui_textarea(obj, .varname = "text", .fill = TRUE);
+            ui_button(obj, .label = "Button");
+            //ui_textarea(obj, .varname = "text", .fill = TRUE);
         }
     }
     
--- a/ui/cocoa/MainWindow.m	Thu Oct 09 18:49:19 2025 +0200
+++ b/ui/cocoa/MainWindow.m	Fri Oct 10 09:06:06 2025 +0200
@@ -31,6 +31,7 @@
 #import "GridLayout.h"
 #import "BoxContainer.h"
 #import "../common/object.h"
+#import "../ui/properties.h"
 #import <objc/runtime.h>
 
 #import "EventData.h"
@@ -84,7 +85,21 @@
     
     if(hasSidebar) {
         // add the sidebar
-        _sidebar = [[NSView alloc]initWithFrame:NSMakeRect(0,0,0,0)];
+        const char *sidebarMaterialProperty = ui_get_property("ui.cocoa.sidebar.usematerial");
+        BOOL useMaterial = YES;
+        if(sidebarMaterialProperty && (sidebarMaterialProperty[0] == 'f' || sidebarMaterialProperty[0] == 'F')) {
+            useMaterial = NO;
+        }
+        
+        if(useMaterial) {
+            NSVisualEffectView *v = [[NSVisualEffectView alloc] initWithFrame:NSMakeRect(0,0,0,0)];
+            v.material = NSVisualEffectMaterialSidebar;
+            v.blendingMode = NSVisualEffectBlendingModeBehindWindow;
+            v.state = NSVisualEffectStateActive;
+            _sidebar = v;
+        } else {
+            _sidebar = [[NSView alloc]initWithFrame:NSMakeRect(0,0,0,0)];
+        }
         _sidebar.translatesAutoresizingMaskIntoConstraints = NO;
         [splitview addArrangedSubview:_sidebar];
         [_sidebar.widthAnchor constraintGreaterThanOrEqualToConstant:250].active = YES;

mercurial