@zakim24/electron-liquid-glass 1.1.3 → 1.1.5

package/package.json

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

package/src/glass_effect.mm

@@ -69,20 +69,27 @@ extern "C" int AddGlassEffectView(unsigned char *buffer, bool opaque) {
   __block int resultId = -1;
 
   RUN_ON_MAIN(^{
-    NSView *rootView = *reinterpret_cast<NSView **>(buffer);
-    if (!rootView) return;
-
-    // Find the proper container - avoid NSThemeFrame
-    NSView *container = rootView;
+    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;
+    }
 
     // Remove previous glass and background views (if any)
-    NSView *oldGlass = objc_getAssociatedObject(container, kGlassEffectKey);
+    // We associate with contentView for consistency
+    NSView *oldGlass = objc_getAssociatedObject(contentView, kGlassEffectKey);
     if (oldGlass) [oldGlass removeFromSuperview];
     
-    NSView *oldBackground = objc_getAssociatedObject(container, kBackgroundViewKey);
+    NSView *oldBackground = objc_getAssociatedObject(contentView, kBackgroundViewKey);
     if (oldBackground) [oldBackground removeFromSuperview];
 
-    NSRect bounds = container.bounds;
+    // Use contentView's frame relative to windowFrame
+    NSRect bounds = contentView.frame;
 
     NSBox *backgroundView = nil;
     
@@ -104,9 +111,7 @@ extern "C" int AddGlassEffectView(unsigned char *buffer, bool opaque) {
         backgroundView.fillColor = [NSColor windowBackgroundColor];
         backgroundView.wantsLayer = YES;
         
-        
-        // Add the background view first (bottom layer)
-        [container addSubview:backgroundView positioned:NSWindowBelow relativeTo:nil];
+        // Note: backgroundView will be added to windowFrame later, below contentView
       }
     } else {
       /**
@@ -123,38 +128,27 @@ 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 click-through by setting it to not accept any mouse events
-    // NSView doesn't have setIgnoresMouseEvents, so we use layer properties
+    // Make the glass view a layer-backed view for better rendering
     glass.wantsLayer = YES;
     
-    // Get the first existing subview to position our glass behind it
-    NSView *firstSubview = container.subviews.firstObject;
-
-    // Add the glass view (positioned BELOW all existing content to not block events)
+    // Add the glass view to the windowFrame, positioned BELOW the contentView
+    // This ensures events go to contentView first, not the glass
     if (opaque && backgroundView) {
-      // Background at very bottom, glass above it, content on top
-      if (firstSubview) {
-        [container addSubview:backgroundView positioned:NSWindowBelow relativeTo:firstSubview];
-        [container addSubview:glass positioned:NSWindowAbove relativeTo:backgroundView];
-      } else {
-        [container addSubview:backgroundView positioned:NSWindowBelow relativeTo:nil];
-        [container addSubview:glass positioned:NSWindowAbove relativeTo: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];
     } else {
-      // Glass at very bottom, content on top
-      if (firstSubview) {
-        [container addSubview:glass positioned:NSWindowBelow relativeTo:firstSubview];
-      } else {
-        [container addSubview:glass positioned:NSWindowBelow relativeTo:nil];
-      }
+      // Glass below contentView
+      [windowFrame addSubview:glass positioned:NSWindowBelow relativeTo:contentView];
     }
     
-    // Associate views with the container for cleanup
-    objc_setAssociatedObject(container, kGlassEffectKey, glass, OBJC_ASSOCIATION_RETAIN);
+    // Associate views with contentView for cleanup (so we can find them later)
+    objc_setAssociatedObject(contentView, kGlassEffectKey, glass, OBJC_ASSOCIATION_RETAIN);
     if (backgroundView) {
-      objc_setAssociatedObject(container, kBackgroundViewKey, backgroundView, OBJC_ASSOCIATION_RETAIN);
+      objc_setAssociatedObject(contentView, kBackgroundViewKey, backgroundView, OBJC_ASSOCIATION_RETAIN);
     } else {
-      objc_setAssociatedObject(container, kBackgroundViewKey, nil, OBJC_ASSOCIATION_ASSIGN);
+      objc_setAssociatedObject(contentView, kBackgroundViewKey, nil, OBJC_ASSOCIATION_ASSIGN);
     }