Skip to content

Commit d508a5c

Browse files
committed
bugfix omni layer start index
1 parent 54dd8b1 commit d508a5c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/svelte/common/Gallery.svelte

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
6161
const omniFrontIndex:number = omniSettings?.frontIndex ?? 0;
6262
const omniNumLayers:number = omniSettings?.layers?.length ?? 1;
63-
const omniLayerStart:number = omniSettings?.layerStartIndex ?? 0;
6463
6564
const startIdxAttr:number|undefined = micrio.hasAttribute('data-gallery-start') ? Number(micrio.getAttribute('data-gallery-start')) : $settings?.omni?.startIndex;
6665
let startIdx = startIdxAttr != undefined && !isNaN(startIdxAttr) ? startIdxAttr : startId ? images.findIndex(i => i.id == startId) : 0;

src/ts/wasm.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,9 @@ export class Wasm {
275275
|| settings.gallery?.type == 'omni'
276276
|| settings.gallery?.type == 'swipe-full');
277277

278+
const numOmniLayers = settings.omni?.layers?.length ?? 1;
279+
if(settings.omni) settings.omni.layerStartIndex = Math.min(numOmniLayers - 1, settings.omni?.layerStartIndex ?? 0);
280+
278281
// Initialize Wasm Canvas
279282
c.ptr = this.e._constructor(
280283
this.i,
@@ -295,8 +298,8 @@ export class Wasm {
295298
!!settings.gallery?.isSpreads && settings.gallery.type == 'swipe',
296299
c.isOmni,
297300
settings.pinchZoomOutLimit ?? false,
298-
settings.omni?.layers?.length ?? 1,
299-
settings.omni?.startIndex ?? 0,
301+
numOmniLayers,
302+
settings.omni?.layerStartIndex ?? 0,
300303
);
301304

302305
this.bindCamera(c);

0 commit comments

Comments
 (0)