@zakim24/electron-liquid-glass 1.1.5 → 1.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zakim24/electron-liquid-glass",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "macOS glass / vibrancy wrapper for Electron BrowserWindow",
   "repository": {
     "type": "git",

package/src/glass_effect.mm

@@ -69,27 +69,20 @@ extern "C" int AddGlassEffectView(unsigned char *buffer, bool opaque) {
   __block int resultId = -1;
 
   RUN_ON_MAIN(^{
-    NSView *contentView = *reinterpret_cast<NSView **>(buffer);
-    if (!contentView) return;
-
-    // CRITICAL: Get the contentView's superview (the window's themeFrame)
-    // We add the glass effect there, BELOW the contentView, so it doesn't block mouse events
-    NSView *windowFrame = contentView.superview;
-    if (!windowFrame) {
-      // Fallback to contentView if no superview (shouldn't happen)
-      windowFrame = contentView;
-    }
+    NSView *rootView = *reinterpret_cast<NSView **>(buffer);
+    if (!rootView) return;
+
+    // Find the proper container - avoid NSThemeFrame
+    NSView *container = rootView;
 
     // Remove previous glass and background views (if any)
-    // We associate with contentView for consistency
-    NSView *oldGlass = objc_getAssociatedObject(contentView, kGlassEffectKey);
+    NSView *oldGlass = objc_getAssociatedObject(container, kGlassEffectKey);
     if (oldGlass) [oldGlass removeFromSuperview];
     
-    NSView *oldBackground = objc_getAssociatedObject(contentView, kBackgroundViewKey);
+    NSView *oldBackground = objc_getAssociatedObject(container, kBackgroundViewKey);
     if (oldBackground) [oldBackground removeFromSuperview];
 
-    // Use contentView's frame relative to windowFrame
-    NSRect bounds = contentView.frame;
+    NSRect bounds = container.bounds;
 
     NSBox *backgroundView = nil;
     
@@ -111,7 +104,9 @@ extern "C" int AddGlassEffectView(unsigned char *buffer, bool opaque) {
         backgroundView.fillColor = [NSColor windowBackgroundColor];
         backgroundView.wantsLayer = YES;
         
-        // Note: backgroundView will be added to windowFrame later, below contentView
+        
+        // Add the background view first (bottom layer)
+        [container addSubview:backgroundView positioned:NSWindowBelow relativeTo:nil];
       }
     } else {
       /**
@@ -127,28 +122,20 @@ extern "C" int AddGlassEffectView(unsigned char *buffer, bool opaque) {
 
     // Ensure autoresize if we created a private glass view too
     glass.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
-    
-    // Make the glass view a layer-backed view for better rendering
-    glass.wantsLayer = YES;
-    
-    // Add the glass view to the windowFrame, positioned BELOW the contentView
-    // This ensures events go to contentView first, not the glass
+
+    // Add the glass view (positioned relative to background view if opaque, or below everything if not)
     if (opaque && backgroundView) {
-      // Background at very bottom, then glass, then contentView on top
-      backgroundView.wantsLayer = YES;
-      [windowFrame addSubview:backgroundView positioned:NSWindowBelow relativeTo:contentView];
-      [windowFrame addSubview:glass positioned:NSWindowAbove relativeTo:backgroundView];
+      [container addSubview:glass positioned:NSWindowAbove relativeTo:backgroundView];
     } else {
-      // Glass below contentView
-      [windowFrame addSubview:glass positioned:NSWindowBelow relativeTo:contentView];
+      [container addSubview:glass positioned:NSWindowBelow relativeTo:nil];
     }
     
-    // Associate views with contentView for cleanup (so we can find them later)
-    objc_setAssociatedObject(contentView, kGlassEffectKey, glass, OBJC_ASSOCIATION_RETAIN);
+    // Associate views with the container for cleanup
+    objc_setAssociatedObject(container, kGlassEffectKey, glass, OBJC_ASSOCIATION_RETAIN);
     if (backgroundView) {
-      objc_setAssociatedObject(contentView, kBackgroundViewKey, backgroundView, OBJC_ASSOCIATION_RETAIN);
+      objc_setAssociatedObject(container, kBackgroundViewKey, backgroundView, OBJC_ASSOCIATION_RETAIN);
     } else {
-      objc_setAssociatedObject(contentView, kBackgroundViewKey, nil, OBJC_ASSOCIATION_ASSIGN);
+      objc_setAssociatedObject(container, kBackgroundViewKey, nil, OBJC_ASSOCIATION_ASSIGN);
     }