summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2023-12-01 15:04:08 +0100
committerLibravatar Héctor Ramón Jiménez <hector@hecrj.dev>2023-12-01 15:04:08 +0100
commit99899d49cc93cdec3832f7b5ecad867fdd421e07 (patch)
tree5a11c9146d5fd03a7f0614a15a904858dfcb0f67 /graphics
parent7f8b17604a31e00becc43130ec516c1a53552c88 (diff)
downloadiced-99899d49cc93cdec3832f7b5ecad867fdd421e07.tar.gz
iced-99899d49cc93cdec3832f7b5ecad867fdd421e07.tar.bz2
iced-99899d49cc93cdec3832f7b5ecad867fdd421e07.zip
Clamp `text::measure` to `Buffer::size`
Diffstat (limited to 'graphics')
-rw-r--r--graphics/src/text.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/graphics/src/text.rs b/graphics/src/text.rs
index 7261900e..fc7694c2 100644
--- a/graphics/src/text.rs
+++ b/graphics/src/text.rs
@@ -76,7 +76,12 @@ pub fn measure(buffer: &cosmic_text::Buffer) -> Size {
(run.line_w.max(width), total_lines + 1)
});
- Size::new(width, total_lines as f32 * buffer.metrics().line_height)
+ let (max_width, max_height) = buffer.size();
+
+ Size::new(
+ width.min(max_width),
+ (total_lines as f32 * buffer.metrics().line_height).min(max_height),
+ )
}
/// Returns the attributes of the given [`Font`].