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

IME toggle button repositioned to the most visible place

Browse Source
This commit is contained in:
minjaesong
2021-12-09 15:44:47 +09:00
parent f3033b2fc3
commit 3c4e169743
1 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,8 +62,8 @@ class UIItemTextLineInput(
override val width: Int, override val width: Int,
var placeholder: () -> String = { "" }, var placeholder: () -> String = { "" },
val maxLen: InputLenCap = InputLenCap(1000, InputLenCap.CharLenUnit.CODEPOINTS), val maxLen: InputLenCap = InputLenCap(1000, InputLenCap.CharLenUnit.CODEPOINTS),
val enablePasteButton: Boolean = true, // val enablePasteButton: Boolean = true,
val enableIMEButton: Boolean = true // val enableIMEButton: Boolean = true
) : UIItem(parentUI, initialX, initialY) { ) : UIItem(parentUI, initialX, initialY) {
init { init {
@@ -77,7 +77,7 @@ class UIItemTextLineInput(
override val height = 24 override val height = 24
private val buttonsShown = enableIMEButton.toInt() + enablePasteButton.toInt() // private val buttonsShown = enableIMEButton.toInt() + enablePasteButton.toInt()
companion object { companion object {
val TEXTINPUT_COL_TEXT = Color.WHITE val TEXTINPUT_COL_TEXT = Color.WHITE
@@ -97,7 +97,7 @@ class UIItemTextLineInput(
private val fbo = FrameBuffer( private val fbo = FrameBuffer(
Pixmap.Format.RGBA8888, Pixmap.Format.RGBA8888,
width - 2 * UI_TEXT_MARGIN - buttonsShown * (WIDTH_ONEBUTTON + 3), width - 2 * UI_TEXT_MARGIN - 2 * (WIDTH_ONEBUTTON + 3),
height - 2 * UI_TEXT_MARGIN, height - 2 * UI_TEXT_MARGIN,
true true
) )
@@ -121,8 +121,9 @@ class UIItemTextLineInput(
private var currentPlaceholderText = ArrayList<Int>(placeholder().toCodePoints()) // the placeholder text may change every time you call it private var currentPlaceholderText = ArrayList<Int>(placeholder().toCodePoints()) // the placeholder text may change every time you call it
private val btn1PosX = posX + width - 2*WIDTH_ONEBUTTON - 3 private val btn1PosX = posX
private val btn2PosX = posX + width - WIDTH_ONEBUTTON private val btn2PosX = posX + width - WIDTH_ONEBUTTON
private val inputPosX = posX + WIDTH_ONEBUTTON + 3
var mouseoverUpdateLatch = true // keep it true by default! var mouseoverUpdateLatch = true // keep it true by default!
set(value) { set(value) {
@@ -138,10 +139,10 @@ class UIItemTextLineInput(
private val mouseUpOnTextArea: Boolean private val mouseUpOnTextArea: Boolean
get() = mouseoverUpdateLatch && itemRelativeMouseX in 0 until fbo.width + 2 * UI_TEXT_MARGIN && itemRelativeMouseY in 0 until height get() = mouseoverUpdateLatch && itemRelativeMouseX in 0 until fbo.width + 2 * UI_TEXT_MARGIN && itemRelativeMouseY in 0 until height
private val mouseUpOnButton1 private val mouseUpOnIMEButton
get() = mouseoverUpdateLatch && buttonsShown > 1 && itemRelativeMouseX in btn1PosX - posX until btn1PosX - posX + WIDTH_ONEBUTTON && itemRelativeMouseY in 0 until height get() = mouseoverUpdateLatch && itemRelativeMouseX in btn1PosX - posX until btn1PosX - posX + WIDTH_ONEBUTTON && itemRelativeMouseY in 0 until height
private val mouseUpOnButton2 private val mouseUpOnPasteButton
get() = mouseoverUpdateLatch && buttonsShown > 0 && itemRelativeMouseX in btn2PosX - posX until btn2PosX - posX + WIDTH_ONEBUTTON && itemRelativeMouseY in 0 until height get() = mouseoverUpdateLatch && itemRelativeMouseX in btn2PosX - posX until btn2PosX - posX + WIDTH_ONEBUTTON && itemRelativeMouseY in 0 until height
private var imeOn = false private var imeOn = false
private var candidates: List<CodepointSequence> = listOf() private var candidates: List<CodepointSequence> = listOf()
@@ -362,11 +363,11 @@ class UIItemTextLineInput(
} }
} }
if (mouseDown && !mouseLatched && (enablePasteButton && enableIMEButton && mouseUpOnButton1 || enableIMEButton && !enablePasteButton && mouseUpOnButton2)) { if (mouseDown && !mouseLatched && mouseUpOnIMEButton) {
toggleIME() toggleIME()
mouseLatched = true mouseLatched = true
} }
else if (mouseDown && !mouseLatched && (enablePasteButton && enableIMEButton && mouseUpOnButton2 || enablePasteButton && !enableIMEButton && mouseUpOnButton2)) { else if (mouseDown && !mouseLatched && mouseUpOnPasteButton) {
endComposing() endComposing()
paste(Clipboard.fetch().substringBefore('\n').substringBefore('\t').toCodePoints()) paste(Clipboard.fetch().substringBefore('\n').substringBefore('\t').toCodePoints())
mouseLatched = true mouseLatched = true
@@ -433,10 +434,13 @@ class UIItemTextLineInput(
} }
private fun moveCursorToEnd(stride: Int) { private fun moveCursorToEnd(stride: Int) {
cursorX += stride try {
cursorDrawX = App.fontGame.getWidth(CodepointSequence(textbuf.subList(0, cursorX))) cursorX += stride
cursorDrawX = App.fontGame.getWidth(CodepointSequence(textbuf.subList(0, cursorX)))
tryCursorBack() tryCursorBack()
}
catch (e: Throwable) {}
} }
override fun render(batch: SpriteBatch, camera: Camera) { override fun render(batch: SpriteBatch, camera: Camera) {
@@ -461,48 +465,44 @@ class UIItemTextLineInput(
// text area cell back // text area cell back
batch.color = TEXTINPUT_COL_BACKGROUND batch.color = TEXTINPUT_COL_BACKGROUND
Toolkit.fillArea(batch, posX, posY, fbo.width + 2 * UI_TEXT_MARGIN, height) Toolkit.fillArea(batch, inputPosX, posY, fbo.width + 2 * UI_TEXT_MARGIN, height)
// rightmost button cell back // button cell back
if (buttonsShown > 0) Toolkit.fillArea(batch, btn2PosX, posY, WIDTH_ONEBUTTON, height)
Toolkit.fillArea(batch, btn2PosX, posY, WIDTH_ONEBUTTON, height) Toolkit.fillArea(batch, btn1PosX, posY, WIDTH_ONEBUTTON, height)
if (buttonsShown > 1)
Toolkit.fillArea(batch, btn1PosX, posY, WIDTH_ONEBUTTON, height)
// text area border (base) // text area border (base)
batch.color = Toolkit.Theme.COL_INACTIVE batch.color = Toolkit.Theme.COL_INACTIVE
Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, width + 2, height + 2) Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, width + 2, height + 2) // this is a full border, not a text area
if (buttonsShown > 0) Toolkit.drawBoxBorder(batch, btn2PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2)
Toolkit.drawBoxBorder(batch, btn2PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2) Toolkit.drawBoxBorder(batch, btn1PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2)
if (buttonsShown > 1)
Toolkit.drawBoxBorder(batch, btn1PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2)
// text area border (pop-up for isActive) // text area border (pop-up for isActive)
if (isActive) { if (isActive) {
batch.color = Toolkit.Theme.COL_HIGHLIGHT batch.color = Toolkit.Theme.COL_HIGHLIGHT
Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, width + 2, height + 2) Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, width + 2, height + 2) // this is a full border, not a text area
} }
// button border // button border
if (mouseUpOnButton2) { if (mouseUpOnPasteButton) {
batch.color = if (mouseDown) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_ACTIVE batch.color = if (mouseDown) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_ACTIVE
Toolkit.drawBoxBorder(batch, btn2PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2) Toolkit.drawBoxBorder(batch, btn2PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2)
} }
else if (mouseUpOnButton1) { else if (mouseUpOnIMEButton) {
batch.color = if (mouseDown) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_ACTIVE batch.color = if (mouseDown) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_ACTIVE
Toolkit.drawBoxBorder(batch, btn1PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2) Toolkit.drawBoxBorder(batch, btn1PosX - 1, posY - 1, WIDTH_ONEBUTTON + 2, height + 2)
} }
else if (mouseUpOnTextArea && !isActive) { else if (mouseUpOnTextArea && !isActive) {
batch.color = Toolkit.Theme.COL_ACTIVE batch.color = Toolkit.Theme.COL_ACTIVE
Toolkit.drawBoxBorder(batch, posX - 1, posY - 1, fbo.width + 2 * UI_TEXT_MARGIN+ 2, height + 2) Toolkit.drawBoxBorder(batch, inputPosX - 1, posY - 1, fbo.width + 2 * UI_TEXT_MARGIN+ 2, height + 2)
} }
// draw text // draw text
batch.color = if (textbuf.isEmpty()) TEXTINPUT_COL_TEXT_DISABLED else TEXTINPUT_COL_TEXT batch.color = if (textbuf.isEmpty()) TEXTINPUT_COL_TEXT_DISABLED else TEXTINPUT_COL_TEXT
batch.draw(fbo.colorBufferTexture, posX + 2f, posY + 2f, fbo.width.toFloat(), fbo.height.toFloat()) batch.draw(fbo.colorBufferTexture, inputPosX + 2f, posY + 2f, fbo.width.toFloat(), fbo.height.toFloat())
// draw text cursor // draw text cursor
val cursorXOnScreen = posX - cursorDrawScroll + cursorDrawX + 2 val cursorXOnScreen = inputPosX - cursorDrawScroll + cursorDrawX + 2
if (isActive && cursorOn) { if (isActive && cursorOn) {
val baseCol = if (maxLen.exceeds(textbuf, listOf(32))) TEXTINPUT_COL_TEXT_NOMORE else TEXTINPUT_COL_TEXT val baseCol = if (maxLen.exceeds(textbuf, listOf(32))) TEXTINPUT_COL_TEXT_NOMORE else TEXTINPUT_COL_TEXT
@@ -516,24 +516,12 @@ class UIItemTextLineInput(
val imeButton = IME.icons[ime?.config?.lang] ?: labels.get(7, 2) val imeButton = IME.icons[ime?.config?.lang] ?: labels.get(7, 2)
// draw icon // draw icon
if (enablePasteButton && enableIMEButton) { // IME button
// IME button batch.color = if (mouseUpOnIMEButton && mouseDown || imeOn) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnIMEButton) Toolkit.Theme.COL_HIGHLIGHT 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(imeButton, btn1PosX + 2f, posY + 2f)
batch.draw(imeButton, btn1PosX + 2f, posY + 2f) // paste button
// paste button batch.color = if (mouseUpOnPasteButton && mouseDown) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnPasteButton) Toolkit.Theme.COL_HIGHLIGHT 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) {
// paste button
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)
}
else if (!enablePasteButton && enableIMEButton) {
// IME button
batch.color = if (mouseUpOnButton1 && mouseDown || imeOn) Toolkit.Theme.COL_ACTIVE else if (mouseUpOnButton1) Toolkit.Theme.COL_HIGHLIGHT else Toolkit.Theme.COL_INACTIVE
batch.draw(imeButton, btn2PosX + 2f, posY + 2f)
}
// state of the candidates are concurrently changing, so we buffer them // state of the candidates are concurrently changing, so we buffer them
val localCandidates = ArrayList<CodepointSequence>(); candidates.forEach { localCandidates.add(it) } val localCandidates = ArrayList<CodepointSequence>(); candidates.forEach { localCandidates.add(it) }