leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

visualise cut items (#954)

Browse source
This commit is contained in:
Daniel 2025-04-28 23:35:27 +10:00 • committed by GitHub
parent 2d22b6d516
commit 569247acfb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 85 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/app.rs
View file

@ -401,6 +401,7 @@ pub enum Message {
Cosmic(app::Action),
None,
Surface(surface::Action),
CutPaths(Vec<PathBuf>),
}
#[derive(Clone, Debug, Eq, PartialEq)]
@ -1100,6 +1101,13 @@ impl App {
paths
}
fn set_cut(&mut self, entity_opt: Option<Entity>) {
let entity = entity_opt.unwrap_or_else(|| self.tab_model.active());
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) {
tab.cut_selected();
}
}
fn update_config(&mut self) -> Task<Message> {
self.update_nav_model();
// Tabs are collected first to placate the borrowck
@ -2218,6 +2226,11 @@ impl Application for App {
}
}
Message::Copy(entity_opt) => {
if let Some(entity) = entity_opt {
if let Some(tab) = self.tab_model.data_mut::<Tab>(entity) {
tab.refresh_cut(&[]);
}
}
let paths = self.selected_paths(entity_opt);
let contents = ClipboardCopy::new(ClipboardKind::Copy, &paths);
return clipboard::write_data(contents);
@ -2230,6 +2243,7 @@ impl Application for App {
));
}
Message::Cut(entity_opt) => {
self.set_cut(entity_opt);
let paths = self.selected_paths(entity_opt);
let contents = ClipboardCopy::new(ClipboardKind::Cut, &paths);
return clipboard::write_data(contents);
@ -3491,6 +3505,15 @@ impl Application for App {
if let Some(selection_paths) = selection_paths {
tab.select_paths(selection_paths);
}
return clipboard::read_data::<ClipboardPaste>().map(|p| {
cosmic::action::app(Message::CutPaths(match p {
Some(s) => match s.kind {
ClipboardKind::Copy => Vec::new(),
ClipboardKind::Cut => s.paths,
},
None => Vec::new(),
}))
});
}
}
}
@ -3503,6 +3526,11 @@ impl Application for App {
config.view = view;
return self.update(Message::TabConfig(config));
}
Message::CutPaths(paths) => {
if let Some(tab) = self.tab_model.active_data_mut::<Tab>() {
tab.refresh_cut(&paths);
}
}
Message::TimeConfigChange(time_config) => {
self.config.tab.military_time = time_config.military_time;
return self.update_config();