diff options
author | 2022-11-17 09:09:11 +0100 | |
---|---|---|
committer | 2022-11-17 09:09:11 +0100 | |
commit | b4aedceac6f3937eabec90fc84d5eda61a000575 (patch) | |
tree | 953adaf024cd056f89a1861b02d6f9ed691c004d /native | |
parent | 5b0dfcd0b0a9f25a3004dbc2cad3dea8220a76a1 (diff) | |
parent | 3bd99221cc3b50ba9e038b1875fec91fdea8039b (diff) | |
download | iced-b4aedceac6f3937eabec90fc84d5eda61a000575.tar.gz iced-b4aedceac6f3937eabec90fc84d5eda61a000575.tar.bz2 iced-b4aedceac6f3937eabec90fc84d5eda61a000575.zip |
Merge pull request #1539 from iced-rs/fix/text-input-padding
Fix padding for `TextInput` with `Length::Units` width
Diffstat (limited to 'native')
-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`] |