@asdf-overlay/electron 1.2.3 → 1.2.5

package/lib/surface.d.ts

@@ -37,6 +37,5 @@ export declare class ElectronOverlaySurface {
      * Copy overlay texture from bitmap surface.
      */
     private paintSoftware;
-    private emitError;
 }
 export {};

package/lib/surface.js

@@ -17,19 +17,15 @@ export class ElectronOverlaySurface {
         this.contents = contents;
         this.surface = OverlaySurface.create(luid);
         this.handler = (e, rect, image) => {
-            const offscreenTexture = e.texture;
-            if (offscreenTexture) {
-                void this.paintAccelerated(offscreenTexture.textureInfo).finally(() => {
-                    offscreenTexture.release();
-                });
-            }
-            else {
-                const size = image.getSize();
-                // offscreenTexture undefined if image is empty, handle the case
-                if (size.width === 0 || size.height === 0) {
-                    return;
+            try {
+                const update = e.texture ? this.paintAccelerated(e.texture) : this.paintSoftware(rect, image);
+                if (update) {
+                    this.window.overlay.updateHandle(this.window.id, update)
+                        .catch((e) => this.events.emit('error', e));
                 }
-                void this.paintSoftware(rect, image);
+            }
+            catch (err) {
+                this.events.emit('error', err);
             }
         };
         contents.on('paint', this.handler);
@@ -51,47 +47,35 @@ export class ElectronOverlaySurface {
     /**
      * Copy overlay texture in gpu accelerated shared texture mode.
      */
-    async paintAccelerated(texture) {
-        // TODO:: cross platform handle
-        if (texture.widgetType !== 'frame' || !texture.handle.ntHandle) {
-            return;
-        }
-        const rect = texture.metadata.captureUpdateRect ?? texture.contentRect;
-        // update only changed part
+    paintAccelerated(texture) {
+        const info = texture.textureInfo;
         try {
-            const update = this.surface.updateShtex(texture.codedSize.width, texture.codedSize.height, texture.handle.ntHandle, {
+            // TODO:: cross platform handle
+            if (info.widgetType !== 'frame' || !info.handle.ntHandle) {
+                return null;
+            }
+            const rect = info.metadata.captureUpdateRect ?? info.contentRect;
+            // update only changed part
+            return this.surface.updateShtex(info.codedSize.width, info.codedSize.height, info.handle.ntHandle, {
                 dstX: rect.x,
                 dstY: rect.y,
                 src: rect,
             });
-            if (update) {
-                await this.window.overlay.updateHandle(this.window.id, update);
-            }
         }
-        catch (e) {
-            this.emitError(e);
+        finally {
+            texture.release();
         }
     }
     /**
      * Copy overlay texture from bitmap surface.
      */
-    async paintSoftware(_dirtyRect, image) {
-        // TODO:: update only changed part
-        try {
-            const update = this.surface.updateBitmap(image.getSize().width, image.toBitmap());
-            if (update) {
-                await this.window.overlay.updateHandle(this.window.id, update);
-            }
-        }
-        catch (e) {
-            this.emitError(e);
+    paintSoftware(_dirtyRect, image) {
+        const size = image.getSize();
+        // offscreenTexture undefined if image is empty, handle the case
+        if (size.width === 0 || size.height === 0) {
+            return null;
         }
-    }
-    emitError(e) {
-        if (this.events.listenerCount('error') !== 0) {
-            this.events.emit('error', e);
-            return;
-        }
-        throw e;
+        // TODO:: update only changed part
+        return this.surface.updateBitmap(image.getSize().width, image.toBitmap());
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asdf-overlay/electron",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "Asdf overlay Electron integration",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -34,7 +34,7 @@
   },
   "peerDependencies": {
     "electron": "^40.1.0",
-    "@asdf-overlay/core": "1.2.3"
+    "@asdf-overlay/core": "1.2.5"
   },
   "scripts": {
     "build:dist": "tsc",