mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

..

Browse source
This commit is contained in:
sxyazi 2026-02-22 10:29:07 +08:00
parent e888cfcfa4
commit 3fa6b641f2
No known key found for this signature in database
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
yazi-fm/src/app/render.rs
View file

@ -5,6 +5,7 @@ use crossterm::{cursor::{MoveTo, SetCursorStyle, Show}, execute, queue, terminal
use ratatui::{CompletedFrame, backend::{Backend, CrosstermBackend}, buffer::Buffer, layout::Position}; use ratatui::{CompletedFrame, backend::{Backend, CrosstermBackend}, buffer::Buffer, layout::Position};
use yazi_actor::{Ctx, lives::Lives}; use yazi_actor::{Ctx, lives::Lives};
use yazi_binding::runtime_scope; use yazi_binding::runtime_scope;
use yazi_config::LAYOUT;
use yazi_macro::{act, succ}; use yazi_macro::{act, succ};
use yazi_plugin::LUA; use yazi_plugin::LUA;
use yazi_shared::{data::Data, event::NEED_RENDER}; use yazi_shared::{data::Data, event::NEED_RENDER};
@ -26,13 +27,12 @@ impl App {
let _guard = scopeguard::guard(self.core.cursor(), |c| Self::routine(false, c)); let _guard = scopeguard::guard(self.core.cursor(), |c| Self::routine(false, c));
let collision = COLLISION.swap(false, Ordering::Relaxed); let collision = COLLISION.swap(false, Ordering::Relaxed);
let frame = term let preview_rect = LAYOUT.get().preview;
.draw(|f| { let frame = term.draw(|f| {
_ = Lives::scope(&self.core, || { _ = Lives::scope(&self.core, || {
runtime_scope!(LUA, "root", Ok(f.render_widget(Root::new(&self.core), f.area()))) runtime_scope!(LUA, "root", Ok(f.render_widget(Root::new(&self.core), f.area())))
}); });
}) })?;
.unwrap();
if COLLISION.load(Ordering::Relaxed) { if COLLISION.load(Ordering::Relaxed) {
Self::patch(frame); Self::patch(frame);
@ -41,10 +41,11 @@ impl App {
self.render_partially()?; self.render_partially()?;
} }
// Reload preview if collision is resolved let cx = &mut Ctx::active(&mut self.core, &mut self.term);
if collision && !COLLISION.load(Ordering::Relaxed) { if collision && !COLLISION.load(Ordering::Relaxed) {
let cx = &mut Ctx::active(&mut self.core, &mut self.term); act!(mgr:peek, cx, true)?; // Reload preview if collision is resolved
act!(mgr:peek, cx, true)?; } else if preview_rect != LAYOUT.get().preview {
act!(mgr:peek, cx)?; // Reload preview if layout changed
} }
succ!(); succ!();
} }
@ -58,17 +59,15 @@ impl App {
Self::routine(true, None); Self::routine(true, None);
let _guard = scopeguard::guard(self.core.cursor(), |c| Self::routine(false, c)); let _guard = scopeguard::guard(self.core.cursor(), |c| Self::routine(false, c));
let frame = term let frame = term.draw_partial(|f| {
.draw_partial(|f| { _ = Lives::scope(&self.core, || {
_ = Lives::scope(&self.core, || { runtime_scope!(LUA, "root", {
runtime_scope!(LUA, "root", { f.render_widget(crate::tasks::Progress::new(&self.core), f.area());
f.render_widget(crate::tasks::Progress::new(&self.core), f.area()); f.render_widget(crate::notify::Notify::new(&self.core), f.area());
f.render_widget(crate::notify::Notify::new(&self.core), f.area()); Ok(())
Ok(()) })
}) });
}); })?;
})
.unwrap();
if COLLISION.load(Ordering::Relaxed) { if COLLISION.load(Ordering::Relaxed) {
Self::patch(frame); Self::patch(frame);