From d3bc84769eca56e1caa4629ea7ae4582fcfb6d26 Mon Sep 17 00:00:00 2001 From: electria Date: Fri, 31 Jul 2026 20:17:25 -0700 Subject: [PATCH] refactor: improve clipboard put code style --- src/main.rs | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/main.rs b/src/main.rs index 2c16d88..013c128 100644 --- a/src/main.rs +++ b/src/main.rs @@ -194,22 +194,19 @@ impl State { None => Clipboard::new(), } { Ok(mut clipboard) => { - match clipboard.get_image().map(utils::rgbaimage_from_arboard) { - Ok(image) => { - self.error = None; - self.clipboard = Some(clipboard); + let result = clipboard.get_image().map(utils::rgbaimage_from_arboard); - self.info = - Some(format!("{}x{}", image.width(), image.height(),)); - if image.dimensions() < (100, 100) { - self.image_filter = widget::image::FilterMethod::Nearest; - } - self.image = Some(image); - return self.allocate_image(); - } - Err(e) => self.error = Some(e.to_string()), - }; + self.error = result.as_ref().map_err(|e| e.to_string()).err(); self.clipboard = Some(clipboard); + + if let Ok(image) = result { + self.info = Some(format!("{}x{}", image.width(), image.height(),)); + if image.dimensions() < (100, 100) { + self.image_filter = widget::image::FilterMethod::Nearest; + } + self.image = Some(image); + return self.allocate_image(); + } } Err(e) => self.error = Some(e.to_string()), }