From bc1bde0d5ca1ec291f13e108f1543daa75b97848 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sun, 10 Sep 2023 03:36:31 +0200
Subject: Fix `ComboBox` widget not displaying selection text

---
 widget/src/text_input.rs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'widget/src/text_input.rs')

diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index bfd196fd..7d5ae806 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -200,6 +200,32 @@ where
         self
     }
 
+    /// Lays out the [`TextInput`], overriding its [`Value`] if provided.
+    ///
+    /// [`Renderer`]: text::Renderer
+    pub fn layout(
+        &self,
+        tree: &mut Tree,
+        renderer: &Renderer,
+        limits: &layout::Limits,
+        value: Option<&Value>,
+    ) -> layout::Node {
+        layout(
+            renderer,
+            limits,
+            self.width,
+            self.padding,
+            self.size,
+            self.font,
+            self.line_height,
+            self.icon.as_ref(),
+            tree.state.downcast_mut::<State<Renderer::Paragraph>>(),
+            value.unwrap_or(&self.value),
+            &self.placeholder,
+            self.is_secure,
+        )
+    }
+
     /// Draws the [`TextInput`] with the given [`Renderer`], overriding its
     /// [`Value`] if provided.
     ///
@@ -1411,7 +1437,7 @@ fn find_cursor_position<P: text::Paragraph>(
 
     Some(
         unicode_segmentation::UnicodeSegmentation::graphemes(
-            &value[..char_offset],
+            &value[..char_offset.min(value.len())],
             true,
         )
         .count(),
-- 
cgit