diff options
| author |  Gigas002 <24297712+Gigas002@users.noreply.github.com> | 2024-04-16 00:08:17 +0900 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-04-16 00:08:17 +0900 |
| commit | 0ebe0629cef37aee5c48b9409fc36618a3a3e60d (patch) | |
| tree | 909d9ecf28e7c491bae3afc81928c118517fa7a9 /widget/src/pick_list.rs | |
| parent | 13bd106fc585034a7aba17b9c17589113274aaf5 (diff) | |
| parent | 105b8bd5ad6ade1f203a0d8b0b93bd06f61f621a (diff) | |
| download | iced-0ebe0629cef37aee5c48b9409fc36618a3a3e60d.tar.gz iced-0ebe0629cef37aee5c48b9409fc36618a3a3e60d.tar.bz2 iced-0ebe0629cef37aee5c48b9409fc36618a3a3e60d.zip | |
Merge branch 'iced-rs:master' into viewer_content_fit
Diffstat (limited to 'widget/src/pick_list.rs')
| -rw-r--r-- | widget/src/pick_list.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/widget/src/pick_list.rs b/widget/src/pick_list.rs index 801e792b..edccfdaa 100644 --- a/widget/src/pick_list.rs +++ b/widget/src/pick_list.rs @@ -479,7 +479,7 @@ where renderer.fill_text( Text { - content: &code_point.to_string(), + content: code_point.to_string(), size, line_height, font, @@ -502,7 +502,7 @@ where let label = selected.map(ToString::to_string); - if let Some(label) = label.as_deref().or(self.placeholder.as_deref()) { + if let Some(label) = label.or_else(|| self.placeholder.clone()) { let text_size = self.text_size.unwrap_or_else(|| renderer.default_size()); |