From 3916f896c0c5f33c0f43987cc6fd1113070421ce Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Thu, 15 Feb 2024 20:33:15 -0700 Subject: [PATCH] allow cancel on definePropScale --- haxe_libraries/hollywoo.hxml | 6 +++--- src/hollywoo_flixel/HollywooFlixelDSL.kiss | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/haxe_libraries/hollywoo.hxml b/haxe_libraries/hollywoo.hxml index c950a85..2afec59 100644 --- a/haxe_libraries/hollywoo.hxml +++ b/haxe_libraries/hollywoo.hxml @@ -1,6 +1,6 @@ -# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#96b34c54d8d8771d2018a3cf4df724058ebbacd3" into hollywoo/0.0.0/github/96b34c54d8d8771d2018a3cf4df724058ebbacd3 -# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/96b34c54d8d8771d2018a3cf4df724058ebbacd3" +# @install: lix --silent download "gh://github.com/kiss-lang/hollywoo#44096b6338094d38b07d2db201299d58682d71d9" into hollywoo/0.0.0/github/44096b6338094d38b07d2db201299d58682d71d9 +# @run: haxelib run-dir hollywoo "${HAXE_LIBCACHE}/hollywoo/0.0.0/github/44096b6338094d38b07d2db201299d58682d71d9" -lib kiss -lib kiss-tools --cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/96b34c54d8d8771d2018a3cf4df724058ebbacd3/src/ +-cp ${HAXE_LIBCACHE}/hollywoo/0.0.0/github/44096b6338094d38b07d2db201299d58682d71d9/src/ -D hollywoo=0.0.0 \ No newline at end of file diff --git a/src/hollywoo_flixel/HollywooFlixelDSL.kiss b/src/hollywoo_flixel/HollywooFlixelDSL.kiss index 2946fd4..04000a4 100644 --- a/src/hollywoo_flixel/HollywooFlixelDSL.kiss +++ b/src/hollywoo_flixel/HollywooFlixelDSL.kiss @@ -493,8 +493,8 @@ cc ->(resume)] (shortcutHandler.registerItem "[d]efine prop [s]cale" ->cc - (director.chooseString "Which prop?" (dictGet propsInScene sceneKey) - ->propKey + (director.chooseString "Which prop?" (withCancel (dictGet propsInScene sceneKey)) + (unlessCancel propKey (withFunctions [ (definePropScale [cc] @@ -509,7 +509,7 @@ (cc))))) ] (set lastCommand definePropScale) - (definePropScale cc)))) + (definePropScale cc))))) (shortcutHandler.registerItem "[d]efine [z] of a position" ->cc (director.chooseString "Which position?" (dictGet positionsInScene sceneKey)