curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-10 10:34:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

more concurrent shit

Browse Source
This commit is contained in:
minjaesong
2021-11-09 16:20:17 +09:00
parent 3c43aeec9d
commit d5bf27aa93
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
View File

@@ -455,12 +455,15 @@ class UIItemTextLineInput(
batch.draw(labels.get(7,2), btn2PosX + 2f, posY + 2f) batch.draw(labels.get(7,2), btn2PosX + 2f, posY + 2f)
} }
// state of the candidates are concurrently changing, so we buffer them
val localCandidates = ArrayList<CodepointSequence>(); candidates.forEach { localCandidates.add(it) }
// draw candidates view // draw candidates view
if (candidates.isNotEmpty()) { if (localCandidates.isNotEmpty()) {
val textWidths = candidates.map { App.fontGame.getWidth(CodepointSequence(it)) }
val textWidths = localCandidates.map { App.fontGame.getWidth(CodepointSequence(it)) }
val candidatesMax = getIME()!!.config.candidates.toInt() val candidatesMax = getIME()!!.config.candidates.toInt()
val candidatesCount = minOf(candidatesMax, candidates.size) val candidatesCount = minOf(candidatesMax, localCandidates.size)
val isOnecolumn = (candidatesCount <= 3) val isOnecolumn = (candidatesCount <= 3)
val halfcount = if (isOnecolumn) candidatesCount else FastMath.ceil(candidatesCount / 2f) val halfcount = if (isOnecolumn) candidatesCount else FastMath.ceil(candidatesCount / 2f)
val candidateWinH = App.fontGame.lineHeight.toInt() * halfcount val candidateWinH = App.fontGame.lineHeight.toInt() * halfcount
@@ -482,7 +485,7 @@ class UIItemTextLineInput(
// candidate texts // candidate texts
for (i in 0 until candidatesCount) { for (i in 0 until candidatesCount) {
val candidateNum = listOf(i+48,46,32) val candidateNum = listOf(i+48,46,32)
App.fontGame.draw(batch, CodepointSequence(candidateNum + candidates[i]), App.fontGame.draw(batch, CodepointSequence(candidateNum + localCandidates[i]),
candidatePosX + (i / halfcount) * (longestCandidateW + 3) + 2, candidatePosX + (i / halfcount) * (longestCandidateW + 3) + 2,
candidatePosY + (i % halfcount) * 20 candidatePosY + (i % halfcount) * 20
) )
@@ -505,7 +508,7 @@ class UIItemTextLineInput(
Toolkit.drawBoxBorder(batch, candidatePosX - 1, candidatePosY - 1, candidateWinW + 2, candidateWinH + 2) Toolkit.drawBoxBorder(batch, candidatePosX - 1, candidatePosY - 1, candidateWinW + 2, candidateWinH + 2)
val previewTextWidth = textWidths[0] val previewTextWidth = textWidths[0]
App.fontGame.draw(batch, candidates[0], candidatePosX + (candidateWinW - previewTextWidth) / 2, candidatePosY) App.fontGame.draw(batch, localCandidates[0], candidatePosX + (candidateWinW - previewTextWidth) / 2, candidatePosY)
} }
} }