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

up to 3 candidates are displayed in single column

Browse Source
This commit is contained in:
minjaesong
2021-10-28 10:13:25 +09:00
parent b4dcb559cd
commit 0f1e01c8ab
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,20 +425,20 @@ class UIItemTextLineInput(
// draw icon // draw icon
if (enablePasteButton && enableIMEButton) { if (enablePasteButton && enableIMEButton) {
// IME button // IME button
batch.color = if (mouseUpOnButton1 && mouseDown || imeOn) Toolkit.Theme.COL_HIGHLIGHT else if (mouseUpOnButton1) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE batch.color = if (mouseUpOnButton1 && mouseDown || imeOn) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnButton1) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_INACTIVE
batch.draw(labels.get(7,2), btn1PosX + 2f, posY + 2f) batch.draw(labels.get(7,2), btn1PosX + 2f, posY + 2f)
// paste button // paste button
batch.color = if (mouseUpOnButton2 && mouseDown) Toolkit.Theme.COL_HIGHLIGHT else if (mouseUpOnButton2) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE batch.color = if (mouseUpOnButton2 && mouseDown) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnButton2) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_INACTIVE
batch.draw(labels.get(8,2), btn2PosX + 2f, posY + 2f) batch.draw(labels.get(8,2), btn2PosX + 2f, posY + 2f)
} }
else if (!enableIMEButton && enablePasteButton) { else if (!enableIMEButton && enablePasteButton) {
// paste button // paste button
batch.color = if (mouseUpOnButton2 && mouseDown) Toolkit.Theme.COL_HIGHLIGHT else if (mouseUpOnButton2) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE batch.color = if (mouseUpOnButton2 && mouseDown) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnButton2) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_INACTIVE
batch.draw(labels.get(8,2), btn2PosX + 2f, posY + 2f) batch.draw(labels.get(8,2), btn2PosX + 2f, posY + 2f)
} }
else if (!enablePasteButton && enableIMEButton) { else if (!enablePasteButton && enableIMEButton) {
// IME button // IME button
batch.color = if (mouseUpOnButton1 && mouseDown || imeOn) Toolkit.Theme.COL_HIGHLIGHT else if (mouseUpOnButton1) Toolkit.Theme.COL_ACTIVE else Toolkit.Theme.COL_INACTIVE batch.color = if (mouseUpOnButton1 && mouseDown || imeOn) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnButton1) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_INACTIVE
batch.draw(labels.get(7,2), btn2PosX + 2f, posY + 2f) batch.draw(labels.get(7,2), btn2PosX + 2f, posY + 2f)
} }
@@ -448,7 +448,8 @@ class UIItemTextLineInput(
val textWidths = candidates.map { App.fontGame.getWidth(CodepointSequence(it)) } val textWidths = candidates.map { App.fontGame.getWidth(CodepointSequence(it)) }
val candidatesMax = getIME()!!.maxCandidates() val candidatesMax = getIME()!!.maxCandidates()
val candidatesCount = minOf(candidatesMax, candidates.size) val candidatesCount = minOf(candidatesMax, candidates.size)
val halfcount = FastMath.ceil(candidatesCount / 2f) val isOnecolumn = (candidatesCount <= 3)
val halfcount = if (isOnecolumn) candidatesCount else FastMath.ceil(candidatesCount / 2f)
val candidateWinH = App.fontGame.lineHeight.toInt() * halfcount val candidateWinH = App.fontGame.lineHeight.toInt() * halfcount
val candidatePosX = cursorXOnScreen + 4 val candidatePosX = cursorXOnScreen + 4
val candidatePosY = posY + 2 val candidatePosY = posY + 2
@@ -456,7 +457,7 @@ class UIItemTextLineInput(
// candidate view text // candidate view text
if (candidatesMax > 1) { if (candidatesMax > 1) {
val longestCandidateW = textWidths.maxOrNull()!! + candidateNumberStrWidth val longestCandidateW = textWidths.maxOrNull()!! + candidateNumberStrWidth
val candidateWinW = if (candidatesCount == 1) longestCandidateW else 2*longestCandidateW + 3 val candidateWinW = if (isOnecolumn) longestCandidateW else 2*longestCandidateW + 3
// candidate view background // candidate view background
batch.color = candidatesBackCol batch.color = candidatesBackCol
@@ -475,7 +476,7 @@ class UIItemTextLineInput(
} }
// candidate view splitter // candidate view splitter
if (candidatesCount > 1) { if (!isOnecolumn) {
batch.color = batch.color.cpy().mul(0.65f,0.65f,0.65f,1f) batch.color = batch.color.cpy().mul(0.65f,0.65f,0.65f,1f)
Toolkit.fillArea(batch, candidatePosX + longestCandidateW + 2, candidatePosY, 1, candidateWinH) Toolkit.fillArea(batch, candidatePosX + longestCandidateW + 2, candidatePosY, 1, candidateWinH)
} }