bump winit

lapce · Nov 29, 2023 · d3ab706 · d3ab706
1 parent 58d5e4a
commit d3ab706
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -28,7 +28,7 @@ floem_renderer = { path = "renderer" }
 floem_vger = { path = "vger" }
 floem_tiny_skia = { path = "tiny_skia" }
 floem_reactive = { path = "reactive" }
-winit = { git = "https://github.com/lapce/winit", rev = "7608048ad91efceb6d97d03dcd74b33c60cc2072", features = ["rwh_05"] }
+winit = { git = "https://github.com/lapce/winit", rev = "e8c26d691a20a96c4e9d841d31fc315dabd5a5a1", features = ["rwh_05"] }
 # winit = { path = "../winit", features = ["rwh_05"] }
 image = { version = "0.24", features = ["jpeg", "png"] }
 copypasta = { version = "0.10.0", default-features = false, features = ["wayland", "x11"] }

diff --git a/examples/widget-gallery/src/clipboard.rs b/examples/widget-gallery/src/clipboard.rs
@@ -16,21 +16,23 @@ pub fn clipboard_view() -> impl View {
         (
             form_item("Simple copy".to_string(), 120.0, move || {
                 button(|| "Copy the answer").on_click_stop(move |_| {
-                    Clipboard::set_contents("42");
+                    let _ = Clipboard::set_contents("42".to_string());
                 })
             }),
             form_item("Copy from input".to_string(), 120.0, move || {
                 h_stack((
                     text_input(text1).keyboard_navigatable(),
                     button(|| "Copy").on_click_stop(move |_| {
-                        Clipboard::set_contents(&text1.get());
+                        let _ = Clipboard::set_contents(text1.get());
                     }),
                 ))
             }),
             form_item("Get clipboard".to_string(), 120.0, move || {
                 v_stack((
                     button(|| "Get clipboard").on_click_stop(move |_| {
-                        text2.set(Clipboard::get_contents().unwrap());
+                        if let Ok(content) = Clipboard::get_contents() {
+                            text2.set(content);
+                        }
                     }),
                     label(move || text2.get()),
                 ))

diff --git a/src/clipboard.rs b/src/clipboard.rs
@@ -18,6 +18,7 @@ pub struct Clipboard {
     selection: Option<Box<dyn ClipboardProvider>>,
 }
 
+#[derive(Clone, Debug)]
 pub enum ClipboardError {
     NotAvailable,
     ProviderError(String),