From 0e5c0056475a11eca2648764aa59c565bc102718 Mon Sep 17 00:00:00 2001
From: Time-linux <ls5474364@gmail.com>
Date: Mon, 21 Oct 2024 11:56:17 +0800
Subject: [PATCH] fix floating window

---
 .../java/com/osfans/trime/ime/composition/Composition.kt | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/osfans/trime/ime/composition/Composition.kt b/app/src/main/java/com/osfans/trime/ime/composition/Composition.kt
index 2f97343735..52b2a65cef 100644
--- a/app/src/main/java/com/osfans/trime/ime/composition/Composition.kt
+++ b/app/src/main/java/com/osfans/trime/ime/composition/Composition.kt
@@ -83,9 +83,6 @@ class Composition(
     private val movableRange = intArrayOf(0, 0)
 
     private val keyTextSizeSpan by lazy { AbsoluteSizeSpan(sp(keyTextSize)) }
-    private val labelTextSizeSpan by lazy { AbsoluteSizeSpan(sp(labelTextSize)) }
-    private val candidateTextSizeSpan by lazy { AbsoluteSizeSpan(sp(candidateTextSize)) }
-    private val commentTextSizeSpan by lazy { AbsoluteSizeSpan(sp(commentTextSize)) }
     private val keyTextColorSpan by lazy { keyTextColor?.let { ForegroundColorSpan(it) } }
     private val highlightTextColorSpan by lazy { highlightTextColor?.let { ForegroundColorSpan(it) } }
     private val highlightBackColorSpan by lazy { highlightBackColor?.let { BackgroundColorSpan(it) } }
@@ -333,7 +330,7 @@ class Composition(
                     labelColor,
                     labelTextSize,
                 )
-            inSpans(alignmentSpan, labelSpan, labelTextSizeSpan) { append(label) }
+            inSpans(alignmentSpan, labelSpan, AbsoluteSizeSpan(sp(labelTextSize))) { append(label) }
 
             val candidateSpan =
                 CandidateSpan(
@@ -344,7 +341,7 @@ class Composition(
                     candidateTextColor,
                     candidateTextSize,
                 )
-            inSpans(alignmentSpan, candidateSpan, candidateTextSizeSpan) { append(text) }
+            inSpans(alignmentSpan, candidateSpan, AbsoluteSizeSpan(sp(candidateTextSize))) { append(text) }
             currentLineLength += text.length
 
             if (showComment && !candidate.comment.isNullOrEmpty()) {
@@ -358,7 +355,7 @@ class Composition(
                         commentTextColor,
                         commentTextSize,
                     )
-                inSpans(alignmentSpan, commentSpan, commentTextSizeSpan) { append(comment) }
+                inSpans(alignmentSpan, commentSpan, AbsoluteSizeSpan(sp(commentTextSize))) { append(comment) }
                 currentLineLength += comment.length
             }
         }