fix unexpected deselection behavior

This commit is contained in:
2022-10-09 00:32:56 +00:00
parent 2cfddcdd50
commit 98cbd9e28e
2 changed files with 4 additions and 7 deletions

View File

@@ -4,7 +4,7 @@
(case arg.type (case arg.type
(SelectedEntry (SelectedEntry
(if (= 1 _selectedEntries.length) (if (= 1 _selectedEntries.length)
(continuation (first _selectedEntries)) (continuation (first (getSelectedEntries)))
(ui.reportError "The requested command expects 1 entry to be selected. You have selected: $_selectedEntries.length"))) (ui.reportError "The requested command expects 1 entry to be selected. You have selected: $_selectedEntries.length")))
((SelectedEntries min max) ((SelectedEntries min max)
(unless min (set min 0)) (unless min (set min 0))
@@ -12,7 +12,7 @@
(unless max (set max (count archive.entries))) (unless max (set max (count archive.entries)))
(if !(<= min _selectedEntries.length max) (if !(<= min _selectedEntries.length max)
(ui.reportError "The requested command expects between $min and $max entries to be selected. You have selected: $_selectedEntries.length") (ui.reportError "The requested command expects between $min and $max entries to be selected. You have selected: $_selectedEntries.length")
(continuation _selectedEntries))) (continuation (getSelectedEntries))))
((Text maxLength) ((Text maxLength)
(unless maxLength (set maxLength Math.POSITIVE_INFINITY)) (unless maxLength (set maxLength Math.POSITIVE_INFINITY))
(stream.dropWhitespace) (stream.dropWhitespace)
@@ -366,6 +366,7 @@
(defCommand SwitchPlayground [name (Text null)] (defCommand SwitchPlayground [name (Text null)]
(archive.changePlaygrounds ->:Void [:DynamicAccess<Dynamic> p] (dictSet p "default" name)) (archive.changePlaygrounds ->:Void [:DynamicAccess<Dynamic> p] (dictSet p "default" name))
(SelectEntries [])
(when playgroundSystem (playgroundSystem.switchPlaygroundKey name)) (when playgroundSystem (playgroundSystem.switchPlaygroundKey name))
[]) [])

View File

@@ -37,9 +37,6 @@
(sprite.kill) (sprite.kill)
(playState.entryGroup.remove sprite true) (playState.entryGroup.remove sprite true)
(sprites.remove e.id)) (sprites.remove e.id))
// When an Entry is hidden, we can bet the user doesn't want it selected anymore
(controller.DeSelectEntry e)
})) }))
(method &override :Void clear [:Color color] (method &override :Void clear [:Color color]
@@ -48,8 +45,7 @@
(sprites.clear) (sprites.clear)
(playState.entryGroup.kill) (playState.entryGroup.kill)
(playState.entryGroup.clear) (playState.entryGroup.clear)
(playState.entryGroup.revive) (playState.entryGroup.revive))
(controller.SelectEntries []))
(method z [:Entry e] (method z [:Entry e]
.z (dictGet (readComponent e Positions) _playgroundKey)) .z (dictGet (readComponent e Positions) _playgroundKey))