From 03472dfd4f8a472f38f03d332b4835580eb84489 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Mon, 12 Aug 2024 02:53:23 +0200
Subject: Make `Padding` affect `text_editor` clipping

---
 widget/src/text_editor.rs | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'widget')

diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs
index 8b4b892d..9e8479fc 100644
--- a/widget/src/text_editor.rs
+++ b/widget/src/text_editor.rs
@@ -768,20 +768,14 @@ where
             style.background,
         );
 
-        let position = bounds.position()
-            + Vector::new(self.padding.left, self.padding.top);
+        let text_bounds = bounds.shrink(self.padding);
 
         if internal.editor.is_empty() {
             if let Some(placeholder) = self.placeholder.clone() {
                 renderer.fill_text(
                     Text {
                         content: placeholder.into_owned(),
-                        bounds: bounds.size()
-                            - Size::new(
-                                self.padding.right,
-                                self.padding.bottom,
-                            ),
-
+                        bounds: text_bounds.size(),
                         size: self
                             .text_size
                             .unwrap_or_else(|| renderer.default_size()),
@@ -791,7 +785,7 @@ where
                         vertical_alignment: alignment::Vertical::Top,
                         shaping: text::Shaping::Advanced,
                     },
-                    position,
+                    text_bounds.position(),
                     style.placeholder,
                     bounds,
                 );
@@ -799,16 +793,13 @@ where
         } else {
             renderer.fill_editor(
                 &internal.editor,
-                position,
+                text_bounds.position(),
                 defaults.text_color,
-                bounds,
+                text_bounds,
             );
         }
 
-        let translation = Vector::new(
-            bounds.x + self.padding.left,
-            bounds.y + self.padding.top,
-        );
+        let translation = text_bounds.position() - Point::ORIGIN;
 
         if let Some(focus) = state.focus.as_ref() {
             match internal.editor.cursor() {
@@ -826,7 +817,9 @@ where
                             ),
                         );
 
-                    if let Some(clipped_cursor) = bounds.intersection(&cursor) {
+                    if let Some(clipped_cursor) =
+                        text_bounds.intersection(&cursor)
+                    {
                         renderer.fill_quad(
                             renderer::Quad {
                                 bounds: Rectangle {
@@ -843,7 +836,7 @@ where
                 }
                 Cursor::Selection(ranges) => {
                     for range in ranges.into_iter().filter_map(|range| {
-                        bounds.intersection(&(range + translation))
+                        text_bounds.intersection(&(range + translation))
                     }) {
                         renderer.fill_quad(
                             renderer::Quad {
-- 
cgit