Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

絵文字のレイアウト崩れを修正

This commit is contained in:
tateisu 2023-02-22 04:20:24 +09:00
parent 6741071181
commit 638113f8cf
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/jp/juggler/subwaytooter/span/NetworkEmojiSpan.kt
View File

@ -68,18 +68,19 @@ class NetworkEmojiSpan constructor(
private var lastWidth: Float? = null private var lastWidth: Float? = null
private var transY = 0f private var transY = 0f
private var baseHeight = 0f private var emojiHeight = 0f
private var emojiWidth = 0f
/** /**
* lastAspect に基づいて rectDst と transY を更新する * lastAspect に基づいて rectDst と transY を更新する
*/ */
private fun updateRect(aspectArg: Float? = null, textSize: Float, baseline: Float) { private fun updateRect(aspectArg: Float? = null, textSize: Float, baseline: Float) {
// テキストサイズをスケーリングした基本高さ // テキストサイズをスケーリングした基本高さ
this.baseHeight = textSize * scaleRatio * scale this.emojiHeight = textSize * scaleRatio * scale
// ベースラインから上下方向にずらすオフセット // ベースラインから上下方向にずらすオフセット
val cDescent = baseHeight * descentRatio val cDescent = emojiHeight * descentRatio
this.transY = baseline - baseHeight + cDescent this.transY = baseline - emojiHeight + cDescent
val aspect = when(aspectArg){ val aspect = when(aspectArg){
null ->{ null ->{
@ -93,28 +94,30 @@ class NetworkEmojiSpan constructor(
when { when {
// 横長画像で、それを許可するモード // 横長画像で、それを許可するモード
aspect > 1f && sizeMode == EmojiSizeMode.Wide -> { aspect > 1.36f && sizeMode == EmojiSizeMode.Wide -> {
// 絵文字のアスペクト比から描画範囲の幅と高さを決める // 絵文字のアスペクト比から描画範囲の幅と高さを決める
val dstWidth = min(maxEmojiWidth, aspect * baseHeight) val dstWidth = min(maxEmojiWidth, aspect * emojiHeight)
val dstHeight = dstWidth / aspect val dstHeight = dstWidth / aspect
val dstX = 0f val dstX = 0f
val dstY = (baseHeight - dstHeight) / 2f val dstY = (emojiHeight - dstHeight) / 2f
rectDst.set(dstX, dstY, dstX + dstWidth, dstY + dstHeight) rectDst.set(dstX, dstY, dstX + dstWidth, dstY + dstHeight)
emojiWidth = dstWidth
} }
else -> { else -> {
emojiWidth = emojiHeight
// 絵文字のアスペクト比から描画範囲の幅と高さを決める // 絵文字のアスペクト比から描画範囲の幅と高さを決める
val dstWidth: Float val dstWidth: Float
val dstHeight: Float val dstHeight: Float
if (aspect >= 1f) { if (aspect >= 1f) {
dstWidth = baseHeight dstWidth = emojiHeight
dstHeight = baseHeight / aspect dstHeight = emojiHeight / aspect
} else { } else {
dstHeight = baseHeight dstHeight = emojiHeight
dstWidth = baseHeight * aspect dstWidth = emojiHeight * aspect
} }
val dstX = (baseHeight - dstWidth) / 2f val dstX = (emojiHeight - dstWidth) / 2f
val dstY = (baseHeight - dstHeight) / 2f val dstY = (emojiHeight - dstHeight) / 2f
rectDst.set(dstX, dstY, dstX + dstWidth, dstY + dstHeight) rectDst.set(dstX, dstY, dstX + dstWidth, dstY + dstHeight)
} }
} }
@ -143,7 +146,7 @@ class NetworkEmojiSpan constructor(
fm: Paint.FontMetricsInt?, fm: Paint.FontMetricsInt?,
): Int { ): Int {
updateRect(aspectArg = null, paint.textSize, baseline = 0f) updateRect(aspectArg = null, paint.textSize, baseline = 0f)
val height = (baseHeight + 0.5f).toInt() val height = (emojiHeight + 0.5f).toInt()
if (fm != null) { if (fm != null) {
val cDescent = (0.5f + height * descentRatio).toInt() val cDescent = (0.5f + height * descentRatio).toInt()
val cAscent = cDescent - height val cAscent = cDescent - height
@ -152,7 +155,7 @@ class NetworkEmojiSpan constructor(
if (fm.descent < cDescent) fm.descent = cDescent if (fm.descent < cDescent) fm.descent = cDescent
if (fm.bottom < cDescent) fm.bottom = cDescent if (fm.bottom < cDescent) fm.bottom = cDescent
} }
return (rectDst.width() + 0.5f).toInt() return (emojiWidth + 0.5f).toInt()
} }
override fun draw( override fun draw(