diff --git a/assets/keylayout/ko_kr_3set_390.ime b/assets/keylayout/ko_kr_3set_390.ime index fc0b9243a..6e2d83237 100644 --- a/assets/keylayout/ko_kr_3set_390.ime +++ b/assets/keylayout/ko_kr_3set_390.ime @@ -379,8 +379,9 @@ Object.freeze({"n":"세벌식 3-90","states":states, }, "end":()=>{ console.log(`end composing`) + let ret = bufAssemble() reset() - return bufAssemble() + return ret }, "reset":()=>{ reset() }, "composing":()=>(states.code!=0) diff --git a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt index aa164fea4..67c13dd0b 100644 --- a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt +++ b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt @@ -14,7 +14,6 @@ import net.torvald.terrarum.gamecontroller.TerrarumInputMethod import net.torvald.terrarum.utils.Clipboard import net.torvald.terrarumsansbitmap.gdx.CodepointSequence import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack -import java.util.ArrayList import kotlin.streams.toList data class InputLenCap(val count: Int, val unit: CharLenUnit) { @@ -205,7 +204,12 @@ class UIItemTextLineInput( cursorX -= 1 cursorDrawX = App.fontGame.getWidth(CodepointSequence(textbuf.subList(0, cursorX))) tryCursorForward() - } + if (cursorX <= 0) { + cursorX = 0 + cursorDrawX = 0 + cursorDrawScroll = 0 + } + } else if (cursorX < textbuf.size && keycodes.contains(Input.Keys.RIGHT)) { // TODO IME endComposing() cursorX += 1