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 2025-01-18 22:38:34 +08:00
parent de932e66b5
commit d5f4cd7c2e
No known key found for this signature in database
5 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yazi-core/src/manager/commands/hover.rs
View file

@ -26,7 +26,7 @@ impl Manager {
if let Some(u) = opt.url { if let Some(u) = opt.url {
self.hover_do(u, opt.tab); self.hover_do(u, opt.tab);
} else { } else {
self.current_or_mut(opt.tab).repos(None); self.current_or_mut(opt.tab).arrow(0);
} }
// Repeek // Repeek

2
yazi-core/src/tab/commands/filter_do.rs
View file

@ -25,7 +25,7 @@ impl Tab {
return; return;
} }
self.current.repos(hovered.as_ref().map(|u| u.as_urn())); self.current.repos(hovered.as_ref());
if self.hovered().map(|f| f.urn()) != hovered.as_ref().map(|u| u.as_urn()) { if self.hovered().map(|f| f.urn()) != hovered.as_ref().map(|u| u.as_urn()) {
ManagerProxy::hover(None, self.id); ManagerProxy::hover(None, self.id);
} }

6
yazi-core/src/tab/folder.rs
View file

@ -74,7 +74,7 @@ impl Folder {
} }
self.trace = self.trace.take_if(|_| !self.files.is_empty() || self.stage.is_loading()); self.trace = self.trace.take_if(|_| !self.files.is_empty() || self.stage.is_loading());
self.repos(self.trace.clone().as_ref().map(|u| u.as_urn())); self.repos(self.trace.clone());
(stage, revision) != (self.stage, self.files.revision) (stage, revision) != (self.stage, self.files.revision)
} }
@ -116,8 +116,8 @@ impl Folder {
} }
#[inline] #[inline]
pub fn repos(&mut self, url: Option<&Urn>) -> bool { pub fn repos(&mut self, url: Option<impl AsRef<Urn>>) -> bool {
if let Some(u) = url { self.hover(u) } else { self.arrow(0) } if let Some(u) = url { self.hover(u.as_ref()) } else { self.arrow(0) }
} }
pub fn sync_page(&mut self, force: bool) { pub fn sync_page(&mut self, force: bool) {

2
yazi-core/src/tab/tab.rs
View file

@ -127,7 +127,7 @@ impl Tab {
f.files.set_sorter(<_>::from(&self.pref)); f.files.set_sorter(<_>::from(&self.pref));
render!(f.files.catchup_revision()); render!(f.files.catchup_revision());
render!(f.repos(f.trace.clone().as_ref().map(|u| u.as_urn()))); render!(f.repos(f.trace.clone()));
}; };
apply(&mut self.current); apply(&mut self.current);

4
yazi-shared/src/url/urn.rs
View file

@ -55,6 +55,10 @@ impl Borrow<Urn> for UrnBuf {
fn borrow(&self) -> &Urn { Urn::new(&self.0) } fn borrow(&self) -> &Urn { Urn::new(&self.0) }
} }
impl AsRef<Urn> for UrnBuf {
fn as_ref(&self) -> &Urn { self.borrow() }
}
impl AsRef<Path> for UrnBuf { impl AsRef<Path> for UrnBuf {
fn as_ref(&self) -> &Path { &self.0 } fn as_ref(&self) -> &Path { &self.0 }
} }