From 1afb61a1ecbf3a2ba14138bbf2c2ebd44bb99a9c Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Fri, 26 May 2023 17:33:09 -0600 Subject: [PATCH] splice when removing in SimpleWindow --- src/kiss_flixel/SimpleWindow.kiss | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/kiss_flixel/SimpleWindow.kiss b/src/kiss_flixel/SimpleWindow.kiss index 6a233f9..604727b 100644 --- a/src/kiss_flixel/SimpleWindow.kiss +++ b/src/kiss_flixel/SimpleWindow.kiss @@ -118,9 +118,9 @@ (let [columnControls (controls.members.slice (if title 1 0))] // Don't count special controls as part of any column: (doFor c [xText leftText rightText] - (when c (columnControls.remove c))) + (when c (columnControls.remove c true))) (doFor c columnTexts - (when c (columnControls.remove c))) + (when c (columnControls.remove c true))) (setNth columnWidths -1 (max (+ control.width textSize) (last columnWidths))) (when (and columnControls (= 0 (% columnControls.length controlsPerColumn))) @@ -250,8 +250,8 @@ (method :Void hide [] (when _shown (FlxG.cameras.remove controlCamera false) - (FlxG.state.remove this) - (FlxG.state.remove controls) + (FlxG.state.remove this true) + (FlxG.state.remove controls true) (windowStack.remove this) (keyHandler.cancel) (xHandler.cancel) @@ -355,7 +355,7 @@ (when (> cameraColumn 0) (-= cameraColumn 1) (when (= cameraColumn 0) - (controls.remove leftText)) + (controls.remove leftText true)) (controls.add rightText) (let [scrollAmount (nth columnWidths cameraColumn)] (-= controlCamera.scroll.x scrollAmount) @@ -383,7 +383,7 @@ (+= xText.x scrollAmount))) (+= cameraColumn 1) (when (< (apply + (columnWidths.slice cameraColumn)) width) - (controls.remove rightText)) + (controls.remove rightText true)) (controls.add leftText) (refreshColumnTexts)))