From 9fc81657a8a249eb61b8b9be6587e274300b9853 Mon Sep 17 00:00:00 2001
From: unlsycn <unlsycn@unlsycn.com>
Date: Fri, 28 Jun 2024 14:58:51 +0800
Subject: [PATCH] fix: NPE in calculating split keyboard size

Signed-off-by: unlsycn <unlsycn@unlsycn.com>
---
 app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt b/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt
index 9b951dd0f0..022bb663d6 100644
--- a/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt
+++ b/app/src/main/java/com/osfans/trime/ime/keyboard/Keyboard.kt
@@ -255,7 +255,10 @@ class Keyboard() {
                 }
                 var widthPx = (keyWidth * oneWeightWidthPx).toInt()
                 widthPx -= gap
-                if (column >= maxColumns || x + widthPx > mDisplayWidth) {
+                if (column >= maxColumns || (x + widthPx > mDisplayWidth && rowWidthTotalWeight.containsKey(
+                        row + 1
+                    ))
+                ) {
                     // new row
                     rowWidthWeight = 0f
                     x = gap / 2