Mercurial > hg > idav / file diff

--- a/ui/cocoa/MainWindow.m	Sun Oct 19 21:20:08 2025 +0200
+++ b/ui/cocoa/MainWindow.m	Mon Nov 10 21:52:51 2025 +0100
@@ -50,12 +50,8 @@
             NSWindowStyleMaskMiniaturizable
                              backing:NSBackingStoreBuffered
                                defer:false];
-    
+    _obj = obj;
     
-    if(uic_toolbar_isenabled()) {
-        UiToolbar *toolbar = [[UiToolbar alloc]initWithObject:obj];
-        [self setToolbar:toolbar];
-    }
     
     int top = 4;
     NSView *content = self.contentView;
@@ -72,6 +68,7 @@
         splitview.dividerStyle = NSSplitViewDividerStyleThin;
         splitview.translatesAutoresizingMaskIntoConstraints = false;
         [self.contentView addSubview:splitview];
+        _splitview = splitview;
         
         [NSLayoutConstraint activateConstraints:@[
             [splitview.topAnchor constraintEqualToAnchor:self.contentView.topAnchor constant:0],
@@ -135,6 +132,12 @@
     }
     _topOffset = top;
     
+    if(uic_toolbar_isenabled()) {
+        UiToolbar *toolbar = [[UiToolbar alloc]initWithWindow:self];
+        [self setToolbar:toolbar];
+    }
+    
+    
     return self;
 }