diff options
author | 2020-04-14 08:04:12 +0200 | |
---|---|---|
committer | 2020-04-14 08:04:12 +0200 | |
commit | d0ebcdb9365b47bc28963759499f0c889f90f90f (patch) | |
tree | c7c07eea984f3bd9c5218e3cd50f80f83c698b18 | |
parent | ce65097834cf5a36bb528a371339b2ff2720dd61 (diff) | |
parent | 88b7dd66012dd9dc5aca6d07c4346f48775cee91 (diff) | |
download | iced-d0ebcdb9365b47bc28963759499f0c889f90f90f.tar.gz iced-d0ebcdb9365b47bc28963759499f0c889f90f90f.tar.bz2 iced-d0ebcdb9365b47bc28963759499f0c889f90f90f.zip |
Merge pull request #294 from MrMonotone/patch-1
Fix tour example
Diffstat (limited to '')
-rw-r--r-- | .github/workflows/test.yml | 2 | ||||
-rw-r--r-- | web/src/widget/checkbox.rs | 4 | ||||
-rw-r--r-- | web/src/widget/radio.rs | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8c5ded3a..520d8da9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,3 +27,5 @@ jobs: - uses: actions/checkout@master - name: Run checks run: cargo check --package iced --target wasm32-unknown-unknown + - name: Check compilation of `tour` example + run: cargo build --package tour --target wasm32-unknown-unknown diff --git a/web/src/widget/checkbox.rs b/web/src/widget/checkbox.rs index 0657ccfb..5ebc26c8 100644 --- a/web/src/widget/checkbox.rs +++ b/web/src/widget/checkbox.rs @@ -43,14 +43,14 @@ impl<Message> Checkbox<Message> { /// `Message`. /// /// [`Checkbox`]: struct.Checkbox.html - pub fn new<F>(is_checked: bool, label: &str, f: F) -> Self + pub fn new<F>(is_checked: bool, label: impl Into<String>, f: F) -> Self where F: 'static + Fn(bool) -> Message, { Checkbox { is_checked, on_toggle: Rc::new(f), - label: String::from(label), + label: label.into(), width: Length::Shrink, style: Default::default(), } diff --git a/web/src/widget/radio.rs b/web/src/widget/radio.rs index e00e26db..520b24cd 100644 --- a/web/src/widget/radio.rs +++ b/web/src/widget/radio.rs @@ -49,7 +49,12 @@ impl<Message> Radio<Message> { /// receives the value of the radio and must produce a `Message`. /// /// [`Radio`]: struct.Radio.html - pub fn new<F, V>(value: V, label: &str, selected: Option<V>, f: F) -> Self + pub fn new<F, V>( + value: V, + label: impl Into<String>, + selected: Option<V>, + f: F, + ) -> Self where V: Eq + Copy, F: 'static + Fn(V) -> Message, @@ -57,7 +62,7 @@ impl<Message> Radio<Message> { Radio { is_selected: Some(value) == selected, on_click: f(value), - label: String::from(label), + label: label.into(), style: Default::default(), } } |