From 892b14e82bfdc045c83aee2b089bef771095004f Mon Sep 17 00:00:00 2001 From: sxyazi Date: Thu, 26 Sep 2024 00:21:47 +0800 Subject: [PATCH] .. --- yazi-core/src/manager/commands/peek.rs | 4 ++-- yazi-core/src/manager/commands/seek.rs | 6 +++--- yazi-core/src/tab/commands/preview.rs | 2 +- yazi-core/src/tab/preview.rs | 9 ++++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/yazi-core/src/manager/commands/peek.rs b/yazi-core/src/manager/commands/peek.rs index a4e31ca0..2c1c1f14 100644 --- a/yazi-core/src/manager/commands/peek.rs +++ b/yazi-core/src/manager/commands/peek.rs @@ -27,7 +27,7 @@ impl From for Opt { impl Manager { pub fn peek(&mut self, opt: impl Into) { let Some(hovered) = self.hovered().cloned() else { - return render!(self.active_mut().preview.reset()); + return self.active_mut().preview.reset(); }; let mime = self.mimetype.get_owned(&hovered.url).unwrap_or_default(); @@ -37,7 +37,7 @@ impl Manager { self.active_mut().preview.skip = folder.map(|f| f.0).unwrap_or_default(); } if !self.active().preview.same_file(&hovered, &mime) { - render!(self.active_mut().preview.reset()); + self.active_mut().preview.reset(); } let opt = opt.into() as Opt; diff --git a/yazi-core/src/manager/commands/seek.rs b/yazi-core/src/manager/commands/seek.rs index ba52aa64..8f2de721 100644 --- a/yazi-core/src/manager/commands/seek.rs +++ b/yazi-core/src/manager/commands/seek.rs @@ -16,7 +16,7 @@ impl From for Opt { impl Manager { pub fn seek(&mut self, opt: impl Into) { let Some(hovered) = self.hovered() else { - return render!(self.active_mut().preview.reset()); + return self.active_mut().preview.reset(); }; let mime = if hovered.is_dir() { @@ -24,11 +24,11 @@ impl Manager { } else if let Some(s) = self.mimetype.get(&hovered.url) { s } else { - return render!(self.active_mut().preview.reset()); + return self.active_mut().preview.reset(); }; let Some(previewer) = PLUGIN.previewer(&hovered.url, mime) else { - return render!(self.active_mut().preview.reset()); + return self.active_mut().preview.reset(); }; let opt = opt.into() as Opt; diff --git a/yazi-core/src/tab/commands/preview.rs b/yazi-core/src/tab/commands/preview.rs index ed838b82..a608b886 100644 --- a/yazi-core/src/tab/commands/preview.rs +++ b/yazi-core/src/tab/commands/preview.rs @@ -18,7 +18,7 @@ impl TryFrom for Opt { impl Tab { pub fn preview(&mut self, opt: impl TryInto) { let Some(hovered) = self.current.hovered().map(|h| &h.url) else { - return render!(self.preview.reset()); + return self.preview.reset(); }; let Ok(opt) = opt.try_into() else { diff --git a/yazi-core/src/tab/preview.rs b/yazi-core/src/tab/preview.rs index 359310e4..1c6cae82 100644 --- a/yazi-core/src/tab/preview.rs +++ b/yazi-core/src/tab/preview.rs @@ -7,7 +7,7 @@ use yazi_adapter::ADAPTOR; use yazi_config::PLUGIN; use yazi_fs::Files; use yazi_plugin::{external::Highlighter, isolate, utils::PreviewLock}; -use yazi_shared::{MIME_DIR, fs::{Cha, File, FilesOp, Url}}; +use yazi_shared::{MIME_DIR, fs::{Cha, File, FilesOp, Url}, render}; #[derive(Default)] pub struct Preview { @@ -27,8 +27,7 @@ impl Preview { } let Some(previewer) = PLUGIN.previewer(&file.url, &mime) else { - self.reset(); - return; + return self.reset(); }; self.abort(); @@ -70,10 +69,10 @@ impl Preview { } #[inline] - pub fn reset(&mut self) -> bool { + pub fn reset(&mut self) { self.abort(); ADAPTOR.image_hide().ok(); - self.lock.take().is_some() + render!(self.lock.take().is_some()) } #[inline]