From e46c05a59720283d6053f6a938ddf9ca139cc47d Mon Sep 17 00:00:00 2001 From: minjaesong Date: Sat, 1 Oct 2022 02:08:48 +0900 Subject: [PATCH] Bulgarian IME now uses Bulgarian glyph variants for the keyboard layout preview --- assets/keylayout/bg_bg_bds.ime | 6 +++++- src/net/torvald/terrarum/ui/UIItemSpinner.kt | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/keylayout/bg_bg_bds.ime b/assets/keylayout/bg_bg_bds.ime index 56c8b0d36..76b8a0882 100644 --- a/assets/keylayout/bg_bg_bds.ime +++ b/assets/keylayout/bg_bg_bds.ime @@ -370,10 +370,14 @@ let diacriticsMapping = { "\u0335":diacriticsStrikethru, "\u0321":diacriticsHookBelow } +let dislplayKeyLayouts = JSON.parse(JSON.stringify(states.keylayouts)) +dislplayKeyLayouts.forEach(ks=>{ks.forEach((k,i)=>{ + ks[i] = "\uDBBF\uDFC1"+k+"\uDBBF\uDFC0" +})}) let inRange = (s,a,b) => (a <= s && s <= b) let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x036F) return Object.freeze({"n":"\uDBBF\uDFC1Бъл. Многоезична\uDBBF\uDFC0","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite", -"t":states.keylayouts, +"t":dislplayKeyLayouts, "l":"bgBG", // return: [displayed output, composed output] "accept":(headkey,shiftin,altgrin)=>{ diff --git a/src/net/torvald/terrarum/ui/UIItemSpinner.kt b/src/net/torvald/terrarum/ui/UIItemSpinner.kt index 3429d3630..806a2206c 100644 --- a/src/net/torvald/terrarum/ui/UIItemSpinner.kt +++ b/src/net/torvald/terrarum/ui/UIItemSpinner.kt @@ -3,7 +3,6 @@ package net.torvald.terrarum.ui import com.badlogic.gdx.graphics.Camera import com.badlogic.gdx.graphics.g2d.SpriteBatch import net.torvald.terrarum.App -import net.torvald.terrarum.App.printdbg import net.torvald.terrarum.CommonResourcePool import net.torvald.terrarum.Terrarum import net.torvald.terrarum.ceilInt @@ -46,7 +45,7 @@ class UIItemSpinner( // to alleviate floating point errors adding up as the spinner is being used private val values = DoubleArray(1 + ((max.toDouble() - min.toDouble()).div(step.toDouble())).ceilInt()) { - printdbg(this, "$min..$max step $step; index [$it] = ${min.toDouble() + (step.toDouble() * it)}") +// printdbg(this, "$min..$max step $step; index [$it] = ${min.toDouble() + (step.toDouble() * it)}") min.toDouble() + (step.toDouble() * it) } private var currentIndex = values.indexOfFirst { it == initialValue.toDouble() }