Skip to content

fix(toolbar): center CJK text vertically in tool buttons #2064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gamma6ray wants to merge 1 commit into from
Closed

fix(toolbar): center CJK text vertically in tool buttons #2064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/src/main/java/com/osfans/trime/ime/bar/ui/ToolButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package com.osfans.trime.ime.bar.ui

import android.content.Context
import android.content.res.ColorStateList
import android.graphics.Rect
import android.graphics.drawable.GradientDrawable
import android.graphics.drawable.LayerDrawable
import android.graphics.drawable.ShapeDrawable
Expand Down Expand Up @@ -117,8 +118,14 @@ class ToolButton : GestureFrame {
ContentType.TEXT -> {
text?.let { label.text = it }
label.textSize = foreground.fontSize
label.includeFontPadding = false
label.padding = dp(foreground.padding)
label.typeface = FontManager.getTypeface("toolbar_font")
val fm = label.paint.fontMetrics
val bounds = Rect()
label.paint.getTextBounds(label.text.toString(), 0, label.text.length, bounds)
val offset = (fm.ascent + fm.descent) / 2f - (bounds.top + bounds.bottom) / 2f
label.translationY = offset
add(label, lParams(wrapContent, wrapContent, gravityCenter))
}
ContentType.LOCAL_IMAGE -> drawable?.let { image.setImageDrawable(it) }
Expand Down