diff options
Diffstat (limited to '')
| -rw-r--r-- | native/src/widget/pick_list.rs | 8 | ||||
| -rw-r--r-- | native/src/widget/text_input.rs | 24 |
2 files changed, 15 insertions, 17 deletions
diff --git a/native/src/widget/pick_list.rs b/native/src/widget/pick_list.rs index 1232878b..c334804e 100644 --- a/native/src/widget/pick_list.rs +++ b/native/src/widget/pick_list.rs @@ -543,9 +543,11 @@ pub fn draw<T, Renderer>( content: label, size: text_size, font: font.clone(), - color: is_selected - .then(|| style.text_color) - .unwrap_or(style.placeholder_color), + color: if is_selected { + style.text_color + } else { + style.placeholder_color + }, bounds: Rectangle { x: bounds.x + f32::from(padding.left), y: bounds.center_y() - text_size / 2.0, diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 8ddbc734..c2d25520 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -615,25 +615,21 @@ where keyboard::KeyCode::C if state.keyboard_modifiers.command() => { - match state.cursor.selection(value) { - Some((start, end)) => { - clipboard.write( - value.select(start, end).to_string(), - ); - } - None => {} + if let Some((start, end)) = + state.cursor.selection(value) + { + clipboard + .write(value.select(start, end).to_string()); } } keyboard::KeyCode::X if state.keyboard_modifiers.command() => { - match state.cursor.selection(value) { - Some((start, end)) => { - clipboard.write( - value.select(start, end).to_string(), - ); - } - None => {} + if let Some((start, end)) = + state.cursor.selection(value) + { + clipboard + .write(value.select(start, end).to_string()); } let mut editor = Editor::new(value, &mut state.cursor); |