lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file_model: Remove next() and previous() functions

Browse source 
These functions required iterating to find the
index of a file and then adding one to it.
We can be smarter, using an index we already
have and adding or subtracting where appropriate.
This commit is contained in:
Christopher Davis 2022-06-29 13:37:55 -04:00
parent 10cdb2c519
commit e13ecb4df4
2 changed files with 6 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/file_model.rs
View file

@ -115,24 +115,6 @@ impl LpFileModel {
model model
} }
pub fn previous(&self, current: &gio::File) -> Option<gio::File> {
let imp = self.imp();
let vec = imp.inner.borrow();
let index = vec.iter().position(|f| f.equal(current))?;
vec.get(index.checked_sub(1)?).cloned()
}
pub fn next(&self, current: &gio::File) -> Option<gio::File> {
let imp = self.imp();
let vec = imp.inner.borrow();
let index = vec.iter().position(|f| f.equal(current))?;
vec.get(index + 1).cloned()
}
pub fn directory(&self) -> Option<gio::File> { pub fn directory(&self) -> Option<gio::File> {
self.imp().directory.get().cloned() self.imp().directory.get().cloned()
} }

11
src/widgets/image_view.rs
View file

@ -143,7 +143,6 @@ impl LpImageView {
} }
self.build_model_from_file(file); self.build_model_from_file(file);
self.update_action_state(file);
self.notify("filename"); self.notify("filename");
// TODO: rework width stuff // TODO: rework width stuff
@ -192,6 +191,7 @@ impl LpImageView {
imp.filename.replace(util::get_file_display_name(file)); imp.filename.replace(util::get_file_display_name(file));
carousel.append(&LpImagePage::from_file(file)); carousel.append(&LpImagePage::from_file(file));
self.fill_carousel(model, index); self.fill_carousel(model, index);
self.update_action_state(index);
} }
} }
@ -243,6 +243,7 @@ impl LpImageView {
// Clear everything on either side, then refill // Clear everything on either side, then refill
self.clear_carousel(true); self.clear_carousel(true);
self.fill_carousel(model, new_index); self.fill_carousel(model, new_index);
self.update_action_state(new_index);
drop(guard); drop(guard);
} }
@ -293,13 +294,13 @@ impl LpImageView {
} }
} }
pub fn update_action_state(&self, file: &gio::File) { pub fn update_action_state(&self, index: u32) {
let imp = self.imp(); let imp = self.imp();
let b = imp.model.borrow(); let b = imp.model.borrow();
let model = b.as_ref().unwrap(); let model = b.as_ref().unwrap();
let next_enabled = model.next(file).is_some(); let next_enabled = model.item(index + 1).is_some();
let prev_enabled = model.previous(file).is_some(); let prev_enabled = index.checked_sub(1).and_then(|i| model.item(i)).is_some();
self.action_set_enabled("iv.next", next_enabled); self.action_set_enabled("iv.next", next_enabled);
self.action_set_enabled("iv.previous", prev_enabled); self.action_set_enabled("iv.previous", prev_enabled);
@ -318,7 +319,7 @@ impl LpImageView {
if model_index != prev_index { if model_index != prev_index {
imp.filename.replace(util::get_file_display_name(&current)); imp.filename.replace(util::get_file_display_name(&current));
self.notify("filename"); self.notify("filename");
self.update_action_state(&current); self.update_action_state(model_index);
// We've moved forward // We've moved forward
if let Some(diff) = model_index.checked_sub(prev_index) { if let Some(diff) = model_index.checked_sub(prev_index) {