diff options
| -rw-r--r-- | glutin/src/application.rs | 2 | ||||
| -rw-r--r-- | native/src/clipboard.rs | 4 | ||||
| -rw-r--r-- | native/src/widget/text_input.rs | 2 | ||||
| -rw-r--r-- | winit/Cargo.toml | 2 | ||||
| -rw-r--r-- | winit/src/application.rs | 2 | ||||
| -rw-r--r-- | winit/src/clipboard.rs | 8 |
6 files changed, 11 insertions, 9 deletions
diff --git a/glutin/src/application.rs b/glutin/src/application.rs index 42513feb..e6bb28e4 100644 --- a/glutin/src/application.rs +++ b/glutin/src/application.rs @@ -136,7 +136,7 @@ async fn run_instance<A, E, C>( use glutin::event; use iced_winit::futures::stream::StreamExt; - let clipboard = Clipboard::new(context.window()); + let clipboard = Clipboard::connect(context.window()); let mut state = application::State::new(&application, context.window()); let mut viewport_version = state.viewport_version(); diff --git a/native/src/clipboard.rs b/native/src/clipboard.rs index ecdccabf..3eeb184d 100644 --- a/native/src/clipboard.rs +++ b/native/src/clipboard.rs @@ -1,6 +1,6 @@ /// A buffer for short-term storage and transfer within and between /// applications. pub trait Clipboard { - /// Returns the current content of the [`Clipboard`] as text. - fn content(&self) -> Option<String>; + /// Reads the current content of the [`Clipboard`] as text. + fn read(&self) -> Option<String>; } diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 2fd9cec1..4c38b1a3 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -509,7 +509,7 @@ where Some(content) => content, None => { let content: String = clipboard - .content() + .read() .unwrap_or(String::new()) .chars() .filter(|c| !c.is_control()) diff --git a/winit/Cargo.toml b/winit/Cargo.toml index 39a6a5fa..ecee0e2e 100644 --- a/winit/Cargo.toml +++ b/winit/Cargo.toml @@ -15,7 +15,7 @@ debug = ["iced_native/debug"] [dependencies] winit = "0.24" -window_clipboard = "0.1" +window_clipboard = "0.2" log = "0.4" thiserror = "1.0" diff --git a/winit/src/application.rs b/winit/src/application.rs index d1a94864..6f8cfc22 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -194,7 +194,7 @@ async fn run_instance<A, E, C>( use winit::event; let surface = compositor.create_surface(&window); - let clipboard = Clipboard::new(&window); + let clipboard = Clipboard::connect(&window); let mut state = State::new(&application, &window); let mut viewport_version = state.viewport_version(); diff --git a/winit/src/clipboard.rs b/winit/src/clipboard.rs index 93d53b11..cce2b371 100644 --- a/winit/src/clipboard.rs +++ b/winit/src/clipboard.rs @@ -5,13 +5,15 @@ pub struct Clipboard(window_clipboard::Clipboard); impl Clipboard { /// Creates a new [`Clipboard`] for the given window. - pub fn new(window: &winit::window::Window) -> Option<Clipboard> { - window_clipboard::Clipboard::new(window).map(Clipboard).ok() + pub fn connect(window: &winit::window::Window) -> Option<Clipboard> { + window_clipboard::Clipboard::connect(window) + .map(Clipboard) + .ok() } } impl iced_native::Clipboard for Clipboard { - fn content(&self) -> Option<String> { + fn read(&self) -> Option<String> { self.0.read().ok() } } |