more gracefully hand keyboard shortcuts from Movie to options menu

haxe_libraries/kiss-flixel.hxml

@@ -1,4 +1,4 @@
-# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#97953584e13a74785cffb534bc9e705ae1ef16bc" into kiss-flixel/0.0.0/github/97953584e13a74785cffb534bc9e705ae1ef16bc
+# @install: lix --silent download "gh://github.com/kiss-lang/kiss-flixel#1a1715a3895db9db6f5d49387f18a790cb513267" into kiss-flixel/0.0.0/github/1a1715a3895db9db6f5d49387f18a790cb513267
 -lib flixel
 -lib flixel-addons
 -lib flixel-ui
@@ -6,5 +6,5 @@
 -lib kiss-tools
 -lib lime
 -lib openfl
--cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/97953584e13a74785cffb534bc9e705ae1ef16bc/src/
+-cp ${HAXE_LIBCACHE}/kiss-flixel/0.0.0/github/1a1715a3895db9db6f5d49387f18a790cb513267/src/
 -D kiss-flixel=0.0.0

src/hollywoo_flixel/FlxDirector.kiss

@@ -85,18 +85,26 @@
         (sh.registerItem "{escape} pause" ->cc (showPauseMenu cc) true)
         (resume)
     } true)
-    (chooseString "PAUSED" ["" "Resume" "Options" "Main Menu" "Quit to Desktop"]
+    (let [choices ["" "Resume" "Options" "Main Menu" "Quit to Desktop"]
-        ->choice
+            optsIdx (choices.indexOf "Options")]
-            (case choice
+        // chooseString automatically sets pauseMenu
-                ("Resume"
+        (chooseString "PAUSED" choices
-                    (sh.registerItem "{escape} pause" ->cc (showPauseMenu cc) true)
+            ->choice
-                    (resume))
+                (case choice
-                ("Options"
+                    ("Resume"
-                    (sh.registerItem "{escape} nil" ->cc {} true)
+                        (sh.registerItem "{escape} pause" ->cc (showPauseMenu cc) true)
-                    (MenuState.optionsMenu ->(showPauseMenu resume)))
+                        (resume))
-                ("Main Menu" (FlxG.switchState (new MenuState)))
+                    ("Options"
-                ("Quit to Desktop" (Sys.exit 0))
+                        (sh.cancel)
-                (never otherwise))))
+                        (MenuState.optionsMenu
+                            ->{
+                                (sh.start)
+                                (showPauseMenu resume)
+                                (set pauseMenu.selectedIndex optsIdx)
+                            }))
+                    ("Main Menu" (FlxG.switchState (new MenuState)))
+                    ("Quit to Desktop" (Sys.exit 0))
+                    (never otherwise)))))
 
 (method :Void showDialogHistory [:Array<HistoryElement<ActorFlxSprite>> history :Continuation resume]
     // register tab and escape to resume (and register escape to pause and tab to history when resuming lol)
@@ -214,7 +222,7 @@
             "up"
             "down"
             "enter"))
-    (pauseMenu.enableGamepadInput true))
+    (pauseMenu.enableGamepadInput true [=>START ""]))
 
 (method :Void enterString [:String prompt :String->Void submit]
     (set pauseMenu