This commit is contained in:
2022-09-25 18:16:09 +00:00
parent 2458042b53
commit 84fa553530

View File

@@ -55,7 +55,7 @@
(when title (-= controlsPerColumn 1))) (when title (-= controlsPerColumn 1)))
(when title (when title
(makeText title null)) (set titleText (makeText title null)))
(set keyHandler.onBadKey ->:Void [key context] (set keyHandler.onBadKey ->:Void [key context]
(unless (= key xKey) (unless (= key xKey)
@@ -117,6 +117,7 @@
(makeScrollArrows)))) (makeScrollArrows))))
control) control)
(prop &mut :FlxText titleText)
(prop &mut :FlxText leftText) (prop &mut :FlxText leftText)
(prop &mut :FlxText rightText) (prop &mut :FlxText rightText)
(prop &mut :FlxText xText) (prop &mut :FlxText xText)
@@ -176,7 +177,7 @@
(makeXControls) (makeXControls)
(set nextControlX 0) (set nextControlX 0)
(set nextControlY 0) (set nextControlY 0)
(makeText title titleColor)) (set titleText (makeText title titleColor)))
(method :Void show [&opt :Int _cameraColumn] (method :Void show [&opt :Int _cameraColumn]
(when (and _cameraColumn !(= cameraColumn _cameraColumn)) (when (and _cameraColumn !(= cameraColumn _cameraColumn))
@@ -281,6 +282,8 @@
(controls.add rightText) (controls.add rightText)
(let [scrollAmount (nth columnWidths cameraColumn)] (let [scrollAmount (nth columnWidths cameraColumn)]
(-= controlCamera.scroll.x scrollAmount) (-= controlCamera.scroll.x scrollAmount)
(when titleText
(-= titleText.x scrollAmount))
(-= leftText.x scrollAmount) (-= leftText.x scrollAmount)
(-= rightText.x scrollAmount) (-= rightText.x scrollAmount)
(when xText (when xText
@@ -290,6 +293,8 @@
(when (< cameraColumn (- columnWidths.length 1 )) (when (< cameraColumn (- columnWidths.length 1 ))
(let [scrollAmount (nth columnWidths cameraColumn)] (let [scrollAmount (nth columnWidths cameraColumn)]
(+= controlCamera.scroll.x scrollAmount) (+= controlCamera.scroll.x scrollAmount)
(when titleText
(+= titleText.x scrollAmount))
(+= leftText.x scrollAmount) (+= leftText.x scrollAmount)
(+= rightText.x scrollAmount) (+= rightText.x scrollAmount)
(when xText (when xText