fix(window): get actual background color of window, not webview

socketsupply · Mar 22, 2024 · d1435c7 · d1435c7
1 parent 8020d31
commit d1435c7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 20 deletions.
diff --git a/api/stream-relay/proxy.js b/api/stream-relay/proxy.js
@@ -82,8 +82,7 @@ class PeerWorkerProxy {
   constructor (options, port, fn) {
     if (!options.isWorkerThread) {
       this.#channel = new MessageChannel()
-      const p = path.join(path.dirname(pathname), 'worker.js')
-      this.#worker = new window.Worker(p)
+      this.#worker = new window.Worker(path.join(path.dirname(pathname), 'worker.js'))
 
       this.#worker.addEventListener('error', err => {
         throw err
@@ -251,7 +250,7 @@ class PeerWorkerProxy {
   callMainThread (prop, args) {
     for (const i in args) {
       const arg = args[i]
-      if (!arg.peerId) continue
+      if (!arg?.peerId) continue
       args[i] = { ...arg }
       delete args[i].localPeer // don't copy this over
     }

diff --git a/src/cli/templates.hh b/src/cli/templates.hh
@@ -216,6 +216,7 @@ constexpr auto gHelloWorld = R"HTML(
         justify-content: center;
         align-content: center;
         font-family: helvetica;
+        overflow: hidden;
       }
     </style>
   </head>

diff --git a/src/window/apple.mm b/src/window/apple.mm
@@ -1068,10 +1068,10 @@ -                       (void) webView: (WKWebView*) webView
     webview.wantsLayer = YES;
     webview.layer.backgroundColor = [NSColor clearColor].CGColor;
 
-    /* [webview
+    [webview
       setValue: [NSNumber numberWithBool: YES]
         forKey: @"drawsTransparentBackground"
-    ]; */
+    ];
 
     // [webview registerForDraggedTypes:
     //  [NSArray arrayWithObject:NSPasteboardTypeFileURL]];
@@ -1541,24 +1541,13 @@ -                       (void) webView: (WKWebView*) webView
   String Window::getBackgroundColor () {
     if (!this->window) return std::string("");
 
-    CALayer *contentLayer = this->window.contentView.layer;
-    CGColorRef backgroundColorRef = contentLayer.backgroundColor;
-    NSColor *backgroundColor = [NSColor colorWithCGColor:backgroundColorRef];
-
+    NSColor *backgroundColor = [this->window backgroundColor];
     NSColor *rgbColor = [backgroundColor colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
 
-    CGFloat red, green, blue, alpha;
-    [rgbColor getRed:&red green:&green blue:&blue alpha:&alpha];
-
-    NSString *colorString = [NSString
-      stringWithFormat:
-        @"rgba(%d, %d, %d, %f)",
-          (int)(red * 255),
-          (int)(green * 255),
-          (int)(blue * 255),
-          alpha
-    ];
+    CGFloat r, g, b, a;
+    [rgbColor getRed:&r green:&g blue:&b alpha:&a];
 
+    NSString *colorString = [NSString stringWithFormat: @"rgba(%.0f,%.0f,%.0f,%.1f)", r * 255, g * 255, b * 255, a];
     return [colorString UTF8String];
   }