diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-11-28 19:42:13 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2022-11-28 19:42:13 +0100 |
| commit | 633150581f442b35b52a52a384b7d935171223ff (patch) | |
| tree | 40530bdfe8fa8321357a9ed5a26945f30a4ca853 /native | |
| parent | 94988bb8f25efb93ee1616e4c827b6f740da8fa5 (diff) | |
| parent | 457d0560caf91884b148422e1ace3d64a38e0e33 (diff) | |
| download | iced-633150581f442b35b52a52a384b7d935171223ff.tar.gz iced-633150581f442b35b52a52a384b7d935171223ff.tar.bz2 iced-633150581f442b35b52a52a384b7d935171223ff.zip | |
Merge branch 'master' into group-solid-triangles
Diffstat (limited to '')
| -rw-r--r-- | native/src/widget/text_input.rs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index ef2f9a17..14e7e1b7 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -383,19 +383,17 @@ where { let text_size = size.unwrap_or_else(|| renderer.default_size()); - let text_limits = limits + let padding = padding.fit(Size::ZERO, limits.max()); + + let limits = limits .pad(padding) .width(width) .height(Length::Units(text_size)); - let limits = limits.width(width).height(Length::Shrink); - - let mut text = layout::Node::new(text_limits.resolve(Size::ZERO)); - let padding = padding.fit(text.size(), limits.max()); - let size = limits.pad(padding).resolve(text.size()).pad(padding); + let mut text = layout::Node::new(limits.resolve(Size::ZERO)); text.move_to(Point::new(padding.left.into(), padding.top.into())); - layout::Node::with_children(size, vec![text]) + layout::Node::with_children(text.size().pad(padding), vec![text]) } /// Processes an [`Event`] and updates the [`State`] of a [`TextInput`] |