From 8d660834094906e0488d53e00b006930f8b014cc Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Tue, 11 Jun 2024 18:19:25 -0700 Subject: [PATCH] fix long standing layout-on-load bug --- src/kiri/init.js | 1 - src/kiri/platform.js | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/kiri/init.js b/src/kiri/init.js index 00dc62de..82dbb9f6 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -2482,7 +2482,6 @@ gapp.register("kiri.init", [], (root, exports) => { }); api.space.restore(init_two) || checkSeed(init_two) || init_two(); - }; // SECOND STAGE INIT AFTER UI RESTORED diff --git a/src/kiri/platform.js b/src/kiri/platform.js index 8437cd52..65ada048 100644 --- a/src/kiri/platform.js +++ b/src/kiri/platform.js @@ -423,7 +423,7 @@ function platformAdd(widget, shift, nolayout, defer) { return; } if (!grouping) { - platformGroupDone(); + platformGroupDone(nolayout); if (!current().controller.autoLayout) { positionNewWidget(widget); } @@ -432,15 +432,17 @@ function platformAdd(widget, shift, nolayout, defer) { } function platformAddDeferred() { + let skiplayout = false; for (let rec of deferred) { let { widget, shift, nolayout } = rec; + skiplayout |= nolayout; // platform.select(widget, shift); if (!nolayout && !current().controller.autoLayout) { positionNewWidget(widget); } } if (!grouping) { - platformGroupDone(); + platformGroupDone(skiplayout); } api.event.emit('widget.add', deferred.map(r => r.widget)); platform.update_bounds(); @@ -622,7 +624,7 @@ function platformSelectAll() { }); } -function platformLayout(event, gap) { +function platformLayout() { const MODE = get_mode(); const settings = current(); const { process, device, controller } = settings; @@ -633,7 +635,7 @@ function platformLayout(event, gap) { isArrange = api.view.is_arrange(), layout = isArrange && auto; - gap = gap || controller.spaceLayout; + let gap = controller.spaceLayout; switch (MODE) { case MODES.SLA: