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

fixed a bug where IME candidate window is rendered too tall for its contents; added QWERTZ layout

Browse Source
This commit is contained in:
minjaesong
2022-08-30 15:02:01 +09:00
parent c8f62c31f4
commit 0310c71c74
2 changed files with 258 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

256
assets/keylayout/en_intl_qwertz.key Normal file
View File

@@ -0,0 +1,256 @@
{"n":"US-Intl. Qwertz","capslock":"caps","t":[[""],[undefined],
[undefined],
["<HOME>"],
[undefined],
["<CALL>"],
["<ENDCALL>"],
["0",")","’","”"],
["1","!","¡","¹"],
["2","@","º","²"],
["3","#","ª","³"],
["4","$","¤","£"],
["5","%","€","€"],
["6","^","¼","\u0302"],
["7","&","½","½"],
["8","*","¾","¾"],
["9","(","‘","“"],
["*"],
["#"],
["<UP>"],
["<DOWN>"],
["<LEFT>"],
["<RIGHT>"],
["<CENTER>"],
["<VOL_UP>"],
["<VOL_DOWN>"],
["<POWER>"],
["<CAMERA>"],
["<CLEAR>"],
["a","A","á","Á"],
["b","B"],
["c","C","¢","©"],
["d","D","ð","Ð"],
["e","E","é","É"],
["f","F"],
["g","G"],
["h","H"],
["i","I","í","Í"],
["j","J"],
["k","K"],
["l","L","ø","Ø"],
["m","M","µ","µ"],
["n","N","ñ","Ñ"],
["o","O","ó","Ó"],
["p","P","ö","Ö"],
["q","Q","ä","Ä"],
["r","R","®","®"],
["s","S","ß","§"],
["t","T","þ","Þ"],
["u","U","ú","Ú"],
["v","V"],
["w","W","å","Å"],
["x","X","¤","¤"],
["z","Z","æ","Æ"],
["y","Y","ü","Ü"],
[",","<","ç","Ç"],
[".",">"],
["<ALT_L>"],
["<ALT_R>"],
["<SHIFT_L>"],
["<SHIFT_R>"],
["<TAB>"],
[" "," ","\u00A0","\u00A0"],
["<SYM>"],
["<EXPLORER>"],
["<ENVELOPE>"],
["\n"],
["\x08"],
["`","~","\u0300","\u0303"],
["-","_","–","—"],
["=","+","×","÷"],
["[","{","«","‹"],
["]","}","»","›"],
["\\","|","¬","¦"],
[";",":","¶","°"],
["'",'"',"\u0301","\u0308"],
["/","?","¿","¿"],
["<AT>"],
["<NUM_LOCK>"],
["<HEADSETHOOK>"],
["<FOCUS>"],
["+"],
["<MENU>"],
["<NOTIFICATION>"],
["<SEARCH>"],
["<PLAY_PAUSE>"],
["<STOP>"],
["<NEXT>"],
["<PREV>"],
["<REW>"],
["<FFWD>"],
["<MUTE>"],
["<PAGE_UP>"],
["<PAGE_DOWN>"],
["<PICTSYMBOLS>"],
["<SWITCH_CHARSET>"],
["<:A:>"],
["<:B:>"],
["<:C:>"],
["<:X:>"],
["<:Y:>"],
["<:Z:>"],
["<:L1:>"],
["<:R1:>"],
["<:L2:>"],
["<:R2:>"],
["<:TL:>"],
["<:TR:>"],
["<:START:>"],
["<:SELECT:>"],
["<:MODE:>"],
["<ESC>"],
["<DEL>"],
[undefined],
[undefined],
["<CAPS_LOCK>"],
["<SCROLL_LOCK>"],
[undefined],
[undefined],
[undefined],
["<PRINT_SCREEN_SYS_RQ>"],
["<PAUSE_BREAK>"],
[undefined],
["<END>"],
["<INSERT>"],
[undefined],
[undefined],
[undefined],
[undefined],
["<CTRL_L>"],
["<CTRL_R>"],
["<F1>"],
["<F2>"],
["<F3>"],
["<F4>"],
["<F5>"],
["<F6>"],
["<F7>"],
["<F8>"],
["<F9>"],
["<F10>"],
["<F11>"],
["<F12>"],
["<NUM_LOCK>"],
["0"],
["1"],
["2"],
["3"],
["4"],
["5"],
["6"],
["7"],
["8"],
["9"],
["/"],
["*"],
["-"],
["+"],
["."],
["."],
["\n"],
["="],
["("],
[")"],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
[undefined],
["<:CIRCLE:>"]
]}

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

@@ -575,7 +575,7 @@ class UIItemTextLineInput(
val candidatesCount = minOf(candidatesMax, localCandidates.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 = halfcount * 20 // using hard-coded 20 instead of the actual font height of 24
val candidatePosX = cursorXOnScreen + 4 val candidatePosX = cursorXOnScreen + 4
val candidatePosY = posY + 2 val candidatePosY = posY + 2
@@ -596,7 +596,7 @@ class UIItemTextLineInput(
val candidateNum = listOf(i+48,46,32) val candidateNum = listOf(i+48,46,32)
App.fontGame.draw(batch, CodepointSequence(candidateNum + localCandidates[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 // using hard-coded 20 instead of the actual font height of 24
) )
} }