kiss-lang/kiss-vscode
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

SimpleWindow xButton and xKey. close #129

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-09-14 20:27:10 +00:00
parent 473e998160
commit b80f50df56
2 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/flixel-desktop-habit-puzzle-game/source/HabitState.kiss
View File

@@ -331,8 +331,9 @@
(refreshModel)
(entryWindow.show)
}
null null FlxColor.WHITE 0.9 0.9 true)]
null null FlxColor.WHITE 0.9 0.9 true xKey ->(nextFrame ->(entryWindow.show)) true)]
(set entryDeletionWindow delWindow))))
(when (= rewardFileIndex (- m.rewardFiles.length 1))
(_makeText "Abandon this puzzle" 0
->_

47
projects/kiss-flixel/src/kiss_flixel/SimpleWindow.kiss
View File

@@ -14,7 +14,9 @@
:FlxColor bgColor
:FlxColor _textColor
:Float percentWidth
:Float percentHeight]
:Float percentHeight
:Bool xButton :String xKey
:ShortcutAction onClose]
[:String title (or _title "")
&mut :Float nextControlX 0
@@ -48,13 +50,29 @@
(when title
(makeText title null))
(set keyHandler.onBadKey ->:Void [_ _] {}) // TODO do SOMETHING
(set keyHandler.onBadKey ->:Void [key context] (print "bad key $key in context $context")) // TODO do SOMETHING like visual/audio bell, cancel and restart
(set keyHandler.onSelectItem
->:Void [:ShortcutAction a] {
(a)
(keyHandler.start)
})
(let [closeAction ->:Void {(hide)(when onClose (onClose))}]
(when xButton
(let [ftext (new FlxText width 0 0 "X" textSize)]
(set ftext.cameras [controlCamera])
(-= ftext.x ftext.width)
(set ftext.color textColor)
(dictSet _colors ftext ftext.color)
(dictSet _actions ftext ->:Void _ (closeAction))
(set xText ftext)
(controls.add xText)))
(when xKey
(when (= keyHandler.cancelKey xKey)
(set keyHandler.cancelKey null))
(keyHandler.registerItem "{${xKey}}" closeAction)))
// TODO show which shortcuts' prefixes are partially highlighted?
)
@@ -81,13 +99,15 @@
(prop &mut :FlxText leftText)
(prop &mut :FlxText rightText)
(prop &mut :FlxText xText)
(method makeScrollArrows []
(unless hasScrollArrows
// The left arrow control is not added until the window scrolls right
(let [ftext (new FlxText 0 height 0 "<-" textSize)]
(set ftext.cameras [controlCamera])
(-= ftext.y ftext.height)
(set ftext.color (or color textColor))
(set ftext.color textColor)
(dictSet _colors ftext ftext.color)
(dictSet _actions ftext ->:Void _ (scrollLeft))
(set leftText ftext))
@@ -95,7 +115,7 @@
(set ftext.cameras [controlCamera])
(-= ftext.x ftext.width)
(-= ftext.y ftext.height)
(set ftext.color (or color textColor))
(set ftext.color textColor)
(dictSet _colors ftext ftext.color)
(controls.add ftext)
(dictSet _actions ftext ->:Void _ (scrollRight))
@@ -192,8 +212,11 @@
:FlxColor choiceColor
:Float percentWidth
:Float percentHeight
:Bool xButton
:String xKey
:ShortcutAction onClose
:Bool noShortcuts]
(let [window (new SimpleWindow prompt bgColor titleColor percentWidth percentHeight)
(let [window (new SimpleWindow prompt bgColor titleColor percentWidth percentHeight xButton xKey onClose)
choiceColor (or choiceColor titleColor FlxColor.WHITE)]
(doFor choice choices
(window.makeText (Std.string choice) choiceColor
@@ -214,15 +237,21 @@
(let [scrollAmount (nth columnWidths cameraColumn)]
(-= controlCamera.scroll.x scrollAmount)
(-= leftText.x scrollAmount)
(-= rightText.x scrollAmount))))
(-= rightText.x scrollAmount)
(-= xText.x scrollAmount))))
(method scrollRight []
(when (< cameraColumn (- columnWidths.length 1 ))
(let [scrollAmount (nth columnWidths cameraColumn)]
(+= controlCamera.scroll.x scrollAmount)
(+= leftText.x scrollAmount)
(+= rightText.x scrollAmount))
(+= rightText.x scrollAmount)
(+= xText.x scrollAmount))
(+= cameraColumn 1)
(when (< (apply + (columnWidths.slice cameraColumn)) width)
(controls.remove rightText))
(controls.add leftText)))
(controls.add leftText)))
// Irreversibly disable the window's buttons (for when you're going to hide it in the next frame)
(method clearActions []
(_actions.clear))