From 936d480267578d7e80675e78ec1880aaaaab72d6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 1 Dec 2023 16:04:27 +0100
Subject: Clip text to `viewport` bounds instead of layout bounds

---
 core/src/renderer/null.rs | 3 +++
 core/src/text.rs          | 5 ++++-
 core/src/widget/text.rs   | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'core/src')

diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs
index da0f32de..3ce6a4f5 100644
--- a/core/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -64,6 +64,7 @@ impl text::Renderer for Null {
         _paragraph: &Self::Paragraph,
         _position: Point,
         _color: Color,
+        _viewport: Rectangle,
     ) {
     }
 
@@ -72,6 +73,7 @@ impl text::Renderer for Null {
         _editor: &Self::Editor,
         _position: Point,
         _color: Color,
+        _viewport: Rectangle,
     ) {
     }
 
@@ -80,6 +82,7 @@ impl text::Renderer for Null {
         _paragraph: Text<'_, Self::Font>,
         _position: Point,
         _color: Color,
+        _viewport: Rectangle,
     ) {
     }
 }
diff --git a/core/src/text.rs b/core/src/text.rs
index 546d0b5c..697fa628 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -9,7 +9,7 @@ pub use highlighter::Highlighter;
 pub use paragraph::Paragraph;
 
 use crate::alignment;
-use crate::{Color, Pixels, Point, Size};
+use crate::{Color, Pixels, Point, Rectangle, Size};
 
 use std::borrow::Cow;
 use std::hash::{Hash, Hasher};
@@ -202,6 +202,7 @@ pub trait Renderer: crate::Renderer {
         text: &Self::Paragraph,
         position: Point,
         color: Color,
+        viewport: Rectangle,
     );
 
     /// Draws the given [`Editor`] at the given position and with the given
@@ -211,6 +212,7 @@ pub trait Renderer: crate::Renderer {
         editor: &Self::Editor,
         position: Point,
         color: Color,
+        viewport: Rectangle,
     );
 
     /// Draws the given [`Text`] at the given position and with the given
@@ -220,5 +222,6 @@ pub trait Renderer: crate::Renderer {
         text: Text<'_, Self::Font>,
         position: Point,
         color: Color,
+        viewport: Rectangle,
     );
 }
diff --git a/core/src/widget/text.rs b/core/src/widget/text.rs
index 97e0acac..e020b030 100644
--- a/core/src/widget/text.rs
+++ b/core/src/widget/text.rs
@@ -172,7 +172,7 @@ where
         style: &renderer::Style,
         layout: Layout<'_>,
         _cursor_position: mouse::Cursor,
-        _viewport: &Rectangle,
+        viewport: &Rectangle,
     ) {
         let state = tree.state.downcast_ref::<State<Renderer::Paragraph>>();
 
@@ -182,6 +182,7 @@ where
             layout,
             state,
             theme.appearance(self.style.clone()),
+            viewport,
         );
     }
 }
@@ -244,6 +245,7 @@ pub fn draw<Renderer>(
     layout: Layout<'_>,
     state: &State<Renderer::Paragraph>,
     appearance: Appearance,
+    viewport: &Rectangle,
 ) where
     Renderer: text::Renderer,
 {
@@ -266,6 +268,7 @@ pub fn draw<Renderer>(
         paragraph,
         Point::new(x, y),
         appearance.color.unwrap_or(style.text_color),
+        *viewport,
     );
 }
 
-- 
cgit 


From b526ce4958b28208395276dd4078ffe0d780e1d7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Sat, 2 Dec 2023 15:53:02 +0100
Subject: Rename `viewport` to `clip_bounds`

---
 core/src/renderer/null.rs | 6 +++---
 core/src/text.rs          | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'core/src')

diff --git a/core/src/renderer/null.rs b/core/src/renderer/null.rs
index 3ce6a4f5..7accd34e 100644
--- a/core/src/renderer/null.rs
+++ b/core/src/renderer/null.rs
@@ -64,7 +64,7 @@ impl text::Renderer for Null {
         _paragraph: &Self::Paragraph,
         _position: Point,
         _color: Color,
-        _viewport: Rectangle,
+        _clip_bounds: Rectangle,
     ) {
     }
 
@@ -73,7 +73,7 @@ impl text::Renderer for Null {
         _editor: &Self::Editor,
         _position: Point,
         _color: Color,
-        _viewport: Rectangle,
+        _clip_bounds: Rectangle,
     ) {
     }
 
@@ -82,7 +82,7 @@ impl text::Renderer for Null {
         _paragraph: Text<'_, Self::Font>,
         _position: Point,
         _color: Color,
-        _viewport: Rectangle,
+        _clip_bounds: Rectangle,
     ) {
     }
 }
diff --git a/core/src/text.rs b/core/src/text.rs
index 697fa628..edef79c2 100644
--- a/core/src/text.rs
+++ b/core/src/text.rs
@@ -202,7 +202,7 @@ pub trait Renderer: crate::Renderer {
         text: &Self::Paragraph,
         position: Point,
         color: Color,
-        viewport: Rectangle,
+        clip_bounds: Rectangle,
     );
 
     /// Draws the given [`Editor`] at the given position and with the given
@@ -212,7 +212,7 @@ pub trait Renderer: crate::Renderer {
         editor: &Self::Editor,
         position: Point,
         color: Color,
-        viewport: Rectangle,
+        clip_bounds: Rectangle,
     );
 
     /// Draws the given [`Text`] at the given position and with the given
@@ -222,6 +222,6 @@ pub trait Renderer: crate::Renderer {
         text: Text<'_, Self::Font>,
         position: Point,
         color: Color,
-        viewport: Rectangle,
+        clip_bounds: Rectangle,
     );
 }
-- 
cgit