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

add a selection marker to SimpleWindow

Browse Source
This commit is contained in:
Nat Quayle Nelson
2023-07-10 10:29:12 -06:00
parent ad5383102d
commit 3c795ef14d
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/kiss_flixel/SimpleWindow.kiss
View File

@@ -8,11 +8,16 @@
(prop :FlxCamera controlCamera) (prop :FlxCamera controlCamera)
(prop &mut keyboardEnabled true) (prop &mut keyboardEnabled true)
(prop :FlxSprite selectionMarker)
(var &mut :FlxSprite defaultSelectionMarker)
(prop &mut :Int _selectedIndex -1) (prop &mut :Int _selectedIndex -1)
(prop :Int selectedIndex (property get set)) (prop :Int selectedIndex (property get set))
(method get_selectedIndex [] _selectedIndex) (method get_selectedIndex [] _selectedIndex)
(method set_selectedIndex [value] (method set_selectedIndex [value]
(when (= -1 value)
(when selectionMarker
(set selectionMarker.visible false)))
(when (= value _selectedIndex) (return value)) (when (= value _selectedIndex) (return value))
(let [columnControls (getColumnControls) (let [columnControls (getColumnControls)
controlToDeselect (nth columnControls _selectedIndex) controlToDeselect (nth columnControls _selectedIndex)
@@ -29,10 +34,18 @@
(when (= -1 value) (return value)) (when (= -1 value) (return value))
(set controlToSelect.color (getHighlighted (dictGet _colors controlToSelect))) (set controlToSelect.color (getHighlighted (dictGet _colors controlToSelect)))
// TODO play screenreader of the text // HANDLE WHEN A CONTROL IS SELECTED:
{
(when ~selectionMarker
(set selectionMarker.visible true)
(set selectionMarker.y controlToSelect.y)
(set selectionMarker.x (- controlToSelect.x selectionMarker.width textSize)))
(whenLet [onSelect (dictGet _onSelectEvents controlToSelect)] // TODO play screenreader of the text
(onSelect controlToSelect))
(whenLet [onSelect (dictGet _onSelectEvents controlToSelect)]
(onSelect controlToSelect))
}
// If selectedIndex refers to a KissInputText, make it active // If selectedIndex refers to a KissInputText, make it active
(typeCase [controlToSelect] (typeCase [controlToSelect]
@@ -86,7 +99,8 @@
:String _leftKey :String _rightKey :String _leftKey :String _rightKey
:String _upKey :String _downKey :String _upKey :String _downKey
:String _enterKey :String _enterKey
:ShortcutAction _onClose] :ShortcutAction _onClose
:FlxSprite _selectionMarker]
[:String title (or _title "") [:String title (or _title "")
&mut :Float nextControlX 0 &mut :Float nextControlX 0
@@ -118,12 +132,15 @@
_height _height
(or bgColor FlxColor.BLACK)) (or bgColor FlxColor.BLACK))
(screenCenter) (screenCenter)
(set selectionMarker (or _selectionMarker (defaultSelectionMarker?.clone)))
(set controlCamera (new FlxCamera (Std.int x) (Std.int y) (Std.int width) (Std.int height))) (set controlCamera (new FlxCamera (Std.int x) (Std.int y) (Std.int width) (Std.int height)))
(set controlCamera.bgColor FlxColor.TRANSPARENT) (set controlCamera.bgColor FlxColor.TRANSPARENT)
// Top-left corner for controls is (0,0) because a camera displays them // Top-left corner for controls is (0,0) because a camera displays them
(set nextControlX 0) (set nextControlX 0)
(when selectionMarker
(set nextControlX (+ selectionMarker.width textSize)))
(set nextControlY 0) (set nextControlY 0)
(let [textHeight (let [textHeight
@@ -218,8 +235,11 @@
(+= nextControlY control.height) (+= nextControlY control.height)
// TODO controls that aren't the same height as text will be able to vertically overflow // TODO controls that aren't the same height as text will be able to vertically overflow
(unless _useScrolling (unless _useScrolling
(let [columnControls (getColumnControls)] (let [columnControls (getColumnControls)
(setNth columnWidths -1 (max (+ control.width textSize) (last columnWidths))) &mut newControlWidth (+ control.width textSize)]
(when selectionMarker
(+= newControlWidth selectionMarker.width textSize))
(setNth columnWidths -1 (max newControlWidth (last columnWidths)))
(when (and columnControls (= 0 (% columnControls.length controlsPerColumn))) (when (and columnControls (= 0 (% columnControls.length controlsPerColumn)))
(set nextControlY 0) (set nextControlY 0)
(when title (+= nextControlY control.height)) (when title (+= nextControlY control.height))
@@ -431,6 +451,10 @@
(FlxG.cameras.add controlCamera false) (FlxG.cameras.add controlCamera false)
(FlxG.state.add this) (FlxG.state.add this)
(FlxG.state.add controls) (FlxG.state.add controls)
(when selectionMarker
(set selectionMarker.visible !(= -1 _selectedIndex))
(set selectionMarker.cameras [controlCamera])
(FlxG.state.add selectionMarker))
(windowStack.push this) (windowStack.push this)
(keyHandler.start) (keyHandler.start)
(xHandler.start) (xHandler.start)
@@ -441,6 +465,8 @@
(FlxG.cameras.remove controlCamera false) (FlxG.cameras.remove controlCamera false)
(FlxG.state.remove this true) (FlxG.state.remove this true)
(FlxG.state.remove controls true) (FlxG.state.remove controls true)
(when selectionMarker
(FlxG.state.remove selectionMarker true))
(windowStack.remove this) (windowStack.remove this)
(keyHandler.cancel) (keyHandler.cancel)
(xHandler.cancel) (xHandler.cancel)