diff options
| author |  Héctor Ramón Jiménez <hector@hecrj.dev> | 2024-04-07 14:01:05 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector@hecrj.dev> | 2024-04-07 14:06:52 +0200 |
| commit | 13289dbd1933e7d7a0b21cffd197813f8f6f7fc0 (patch) | |
| tree | 85cbda9aa86c277e623943307c63a33e192ae609 /widget | |
| parent | 5e01d767c5ef8a35937675d4e8f02b4c678a5da2 (diff) | |
| parent | 1c241d1150d2f7b5d0ae154439325950e5d25f38 (diff) | |
| download | iced-13289dbd1933e7d7a0b21cffd197813f8f6f7fc0.tar.gz iced-13289dbd1933e7d7a0b21cffd197813f8f6f7fc0.tar.bz2 iced-13289dbd1933e7d7a0b21cffd197813f8f6f7fc0.zip | |
Merge branch 'master' into wgpu/better-architecture
Diffstat (limited to 'widget')
| -rw-r--r-- | widget/Cargo.toml | 3 | ||||
| -rw-r--r-- | widget/src/lib.rs | 7 | ||||
| -rw-r--r-- | widget/src/text_editor.rs | 15 | ||||
| -rw-r--r-- | widget/src/text_input.rs | 6 |
4 files changed, 22 insertions, 9 deletions
diff --git a/widget/Cargo.toml b/widget/Cargo.toml index 84525935..3c9f6a54 100644 --- a/widget/Cargo.toml +++ b/widget/Cargo.toml @@ -10,6 +10,9 @@ homepage.workspace = true categories.workspace = true keywords.workspace = true +[lints] +workspace = true + [package.metadata.docs.rs] rustdoc-args = ["--cfg", "docsrs"] all-features = true diff --git a/widget/src/lib.rs b/widget/src/lib.rs index 209dfad9..1eeacbae 100644 --- a/widget/src/lib.rs +++ b/widget/src/lib.rs @@ -2,13 +2,6 @@ #![doc( html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg" )] -#![forbid(unsafe_code, rust_2018_idioms)] -#![deny( - missing_debug_implementations, - missing_docs, - unused_results, - rustdoc::broken_intra_doc_links -)] #![cfg_attr(docsrs, feature(doc_auto_cfg))] pub use iced_renderer as renderer; pub use iced_renderer::graphics; diff --git a/widget/src/text_editor.rs b/widget/src/text_editor.rs index a00df3c7..92cdb251 100644 --- a/widget/src/text_editor.rs +++ b/widget/src/text_editor.rs @@ -110,6 +110,21 @@ where self } + /// Sets the text size of the [`TextEditor`]. + pub fn size(mut self, size: impl Into<Pixels>) -> Self { + self.text_size = Some(size.into()); + self + } + + /// Sets the [`text::LineHeight`] of the [`TextEditor`]. + pub fn line_height( + mut self, + line_height: impl Into<text::LineHeight>, + ) -> Self { + self.line_height = line_height.into(); + self + } + /// Sets the [`Padding`] of the [`TextEditor`]. pub fn padding(mut self, padding: impl Into<Padding>) -> Self { self.padding = padding.into(); diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs index 05dd87b1..e9f07838 100644 --- a/widget/src/text_input.rs +++ b/widget/src/text_input.rs @@ -713,7 +713,8 @@ where match key.as_ref() { keyboard::Key::Character("c") - if state.keyboard_modifiers.command() => + if state.keyboard_modifiers.command() + && !self.is_secure => { if let Some((start, end)) = state.cursor.selection(&self.value) @@ -727,7 +728,8 @@ where return event::Status::Captured; } keyboard::Key::Character("x") - if state.keyboard_modifiers.command() => + if state.keyboard_modifiers.command() + && !self.is_secure => { if let Some((start, end)) = state.cursor.selection(&self.value) |