diff options
author | 2020-01-09 06:04:05 +0100 | |
---|---|---|
committer | 2020-01-09 06:04:05 +0100 | |
commit | 5e018965ee99c44fe50f9be8f7b69cd486d183be (patch) | |
tree | 65862c87a2835e71ad074e143efbbb6d665a535b /native/src | |
parent | 89b1ac6eac03bec9e2acb9b4d59da86e59d26153 (diff) | |
parent | 6699329d3f91c5b9d8e8e55ad88de24bd3894955 (diff) | |
download | iced-5e018965ee99c44fe50f9be8f7b69cd486d183be.tar.gz iced-5e018965ee99c44fe50f9be8f7b69cd486d183be.tar.bz2 iced-5e018965ee99c44fe50f9be8f7b69cd486d183be.zip |
Merge branch 'master' into feature/custom-styling
Diffstat (limited to 'native/src')
-rw-r--r-- | native/src/widget/checkbox.rs | 2 | ||||
-rw-r--r-- | native/src/widget/column.rs | 2 | ||||
-rw-r--r-- | native/src/widget/radio.rs | 1 | ||||
-rw-r--r-- | native/src/widget/row.rs | 2 | ||||
-rw-r--r-- | native/src/widget/svg.rs | 2 | ||||
-rw-r--r-- | native/src/widget/text.rs | 2 | ||||
-rw-r--r-- | native/src/widget/text_input.rs | 2 |
7 files changed, 7 insertions, 6 deletions
diff --git a/native/src/widget/checkbox.rs b/native/src/widget/checkbox.rs index 13a59410..d88a59f4 100644 --- a/native/src/widget/checkbox.rs +++ b/native/src/widget/checkbox.rs @@ -53,7 +53,7 @@ impl<Message, Renderer: self::Renderer> Checkbox<Message, Renderer> { is_checked, on_toggle: Box::new(f), label: String::from(label), - width: Length::Fill, + width: Length::Shrink, style: Renderer::Style::default(), } } diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs index 3418d4b0..79ec5ab4 100644 --- a/native/src/widget/column.rs +++ b/native/src/widget/column.rs @@ -33,7 +33,7 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> { Column { spacing: 0, padding: 0, - width: Length::Fill, + width: Length::Shrink, height: Length::Shrink, max_width: u32::MAX, max_height: u32::MAX, diff --git a/native/src/widget/radio.rs b/native/src/widget/radio.rs index faf2736c..b0a6080b 100644 --- a/native/src/widget/radio.rs +++ b/native/src/widget/radio.rs @@ -96,6 +96,7 @@ where let size = self::Renderer::default_size(renderer); Row::<(), Renderer>::new() + .width(Length::Fill) .spacing(15) .align_items(Align::Center) .push( diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs index 76cca3d0..b3dc90ba 100644 --- a/native/src/widget/row.rs +++ b/native/src/widget/row.rs @@ -33,7 +33,7 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> { Row { spacing: 0, padding: 0, - width: Length::Fill, + width: Length::Shrink, height: Length::Shrink, max_width: u32::MAX, max_height: u32::MAX, diff --git a/native/src/widget/svg.rs b/native/src/widget/svg.rs index f6202f72..063730bb 100644 --- a/native/src/widget/svg.rs +++ b/native/src/widget/svg.rs @@ -30,7 +30,7 @@ impl Svg { Svg { handle: handle.into(), width: Length::Fill, - height: Length::Fill, + height: Length::Shrink, } } diff --git a/native/src/widget/text.rs b/native/src/widget/text.rs index 3a3db3cd..e4490fb6 100644 --- a/native/src/widget/text.rs +++ b/native/src/widget/text.rs @@ -41,7 +41,7 @@ impl Text { size: None, color: None, font: Font::Default, - width: Length::Fill, + width: Length::Shrink, height: Length::Shrink, horizontal_alignment: HorizontalAlignment::Left, vertical_alignment: VerticalAlignment::Top, diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index ee8e5ade..efbd65c8 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -70,7 +70,7 @@ impl<'a, Message, Renderer: self::Renderer> TextInput<'a, Message, Renderer> { where F: 'static + Fn(String) -> Message, { - Self { + TextInput { state, placeholder: String::from(placeholder), value: Value::new(value), |