forked from Blendman974/faceclaw
Fix some iOS crashes; show the ring connection setting
This commit is contained in:
1 parent
e12ea8ee4c
commit
7e59f4a58d
6 files changed
+103
-15
No files matched your search
@@ -524,7 +524,10 @@ export class FaceclawCommunicatorBridge {
|
||||
id, Math.round(options.x), Math.round(options.y), Math.round(options.width), Math.round(options.height),
|
||||
Math.round(options.zOrder), transparency,
|
||||
);
|
||||
if (configured !== false) this.nativeSurfaces.add(id);
|
||||
// Kotlin logged why; reject so callers don't treat the surface as live (as on Android,
|
||||
// where the compositor's exception reaches JS).
|
||||
if (configured === false) throw new Error(`Could not configure surface ${id}`);
|
||||
this.nativeSurfaces.add(id);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -85,12 +85,25 @@ export class PreviewDisplayTarget implements DisplayTarget {
|
||||
this.composited();
|
||||
}
|
||||
|
||||
/**
|
||||
* As on the live bridge (FaceclawCommunicatorBridge.hasNativeSurface): a call that lands
|
||||
* after its window closed, or on a target that replaced the one it was configured on, is
|
||||
* dropped rather than failing the caller.
|
||||
*/
|
||||
private hasSurface(id: string, what: string): boolean {
|
||||
if (this.compositor.hasSurface(id)) return true;
|
||||
console.log(`[ios-preview] ${what} for unknown surface ${id} dropped`);
|
||||
return false;
|
||||
}
|
||||
|
||||
async setSurfaceVisible(id: string, visible: boolean): Promise<void> {
|
||||
if (!this.hasSurface(id, "setSurfaceVisible")) return;
|
||||
this.compositor.setSurfaceVisible(id, Boolean(visible));
|
||||
this.composited();
|
||||
}
|
||||
|
||||
async setSurfaceDepth(id: string, depth: number): Promise<void> {
|
||||
if (!this.hasSurface(id, "setSurfaceDepth")) return;
|
||||
this.compositor.setSurfaceDepth(id, Math.round(depth));
|
||||
}
|
||||
|
||||
@@ -113,6 +126,7 @@ export class PreviewDisplayTarget implements DisplayTarget {
|
||||
_frameId = 0,
|
||||
glyphs: ArrayBuffer | null = null,
|
||||
): Promise<void> {
|
||||
if (!this.hasSurface(surfaceId, "frame")) return;
|
||||
this.compositor.submitSurfaceFrame(surfaceId, pixels8bpp,
|
||||
{ x: Math.round(rect.x), y: Math.round(rect.y), width: Math.round(rect.width), height: Math.round(rect.height) }, glyphs);
|
||||
this.composited();
|
||||
|
||||
Reference in new issue
Block a user