Merge pull request #5311 from Susko3/fix-zero-width-textbox-throwing

Fix zero width textbox throwing in `updateImeWindowPosition()`
ppy · Jul 18, 2022 · 582170e · 582170e
2 parents 08c4006 + b076c04
commit 582170e
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/osu.Framework/Graphics/UserInterface/TextBox.cs b/osu.Framework/Graphics/UserInterface/TextBox.cs
@@ -1570,8 +1570,17 @@ private void updateImeWindowPosition()
             float start = getPositionAt(startIndex) - textContainerPosX + LeftRightPadding;
             float end = getPositionAt(endIndex) - textContainerPosX + LeftRightPadding;
 
-            start = Math.Clamp(start, LeftRightPadding, DrawWidth - LeftRightPadding);
-            end = Math.Clamp(end, LeftRightPadding, DrawWidth - LeftRightPadding);
+            if (LeftRightPadding <= DrawWidth - LeftRightPadding)
+            {
+                start = Math.Clamp(start, LeftRightPadding, DrawWidth - LeftRightPadding);
+                end = Math.Clamp(end, LeftRightPadding, DrawWidth - LeftRightPadding);
+            }
+            else
+            {
+                // DrawWidth is probably zero/invalid, sane fallback instead of throwing in Math.Clamp
+                start = 0;
+                end = 0;
+            }
 
             var compositionTextRectangle = new RectangleF
             {