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

fix: attemp 1 to fix input over preview

Browse source
This commit is contained in:
Yuyang Zhang 2023-11-17 22:32:34 -05:00
parent d0b6810cb3
commit 7f7f123f4a
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
yazi-fm/src/app.rs
View file

@ -8,6 +8,9 @@ use yazi_config::{keymap::{Exec, Key, KeymapLayer}, BOOT};
use yazi_core::{emit, files::FilesOp, input::InputMode, Ctx, Event}; use yazi_core::{emit, files::FilesOp, input::InputMode, Ctx, Event};
use yazi_shared::Term; use yazi_shared::Term;
use yazi_adaptor::ADAPTOR;
// use yazi_config::MANAGER;
use crate::{Executor, Logs, Panic, Root, Signals}; use crate::{Executor, Logs, Panic, Root, Signals};
pub(super) struct App { pub(super) struct App {
@ -176,10 +179,16 @@ impl App {
Event::Select(opt, tx) => { Event::Select(opt, tx) => {
self.cx.select.show(opt, tx); self.cx.select.show(opt, tx);
let Rect { x, y, width, height} = self.cx.area(&self.cx.select.position);
let select_area = Rect {x:x+1, y:y+1, width:width-2, height:height-2};
ADAPTOR.image_hide(select_area).ok();
emit!(Render); emit!(Render);
} }
Event::Input(opt, tx) => { Event::Input(opt, tx) => {
self.cx.input.show(opt, tx); self.cx.input.show(opt, tx);
let Rect { x, y, width, height} = self.cx.area(&self.cx.input.position);
let input_area = Rect {x:x+1, y:y+1, width:width-2, height:height-2};
ADAPTOR.image_hide(input_area).ok();
emit!(Render); emit!(Render);
} }

23
yazi-fm/src/executor.rs
View file

@ -184,11 +184,15 @@ impl<'a> Executor<'a> {
}; };
} }
on!(close);
on!(arrow); on!(arrow);
match exec.cmd.as_str() { match exec.cmd.as_str() {
"help" => self.cx.help.toggle(KeymapLayer::Select), "help" => self.cx.help.toggle(KeymapLayer::Select),
"close" => {
self.cx.manager.active_mut().preview.reset(|_| true);
self.cx.manager.peek(false);
self.cx.select.close(exec)
},
_ => false, _ => false,
} }
} }
@ -207,11 +211,22 @@ impl<'a> Executor<'a> {
}; };
} }
on!(close);
on!(escape);
on!(move_, "move"); on!(move_, "move");
if exec.cmd.as_str() == "complete" {
if exec.cmd.as_str() == "close" {
self.cx.manager.active_mut().preview.reset(|_| true);
self.cx.manager.peek(false);
return self.cx.input.close(exec);
}
else if exec.cmd.as_str() == "escape" {
if self.cx.input.mode() == InputMode::Normal {
self.cx.manager.active_mut().preview.reset(|_| true);
self.cx.manager.peek(false);
}
return self.cx.input.escape(exec);
}
else if exec.cmd.as_str() == "complete" {
return if exec.args.is_empty() { return if exec.args.is_empty() {
self.cx.completion.trigger(exec) self.cx.completion.trigger(exec)
} else { } else {