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

file_model: Add file() function

Browse source 
Adds a function to get the file at a given index directly,
instead of going through GListModel::item().
This commit is contained in:
Christopher Davis 2022-06-29 16:51:16 -04:00
parent e13ecb4df4
commit 70054971d9
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/file_model.rs
View file

@ -119,6 +119,11 @@ impl LpFileModel {
self.imp().directory.get().cloned()
}
pub fn file(&self, index: u32) -> Option<gio::File> {
let vec = self.imp().inner.borrow();
vec.get(index as usize).cloned()
}
pub fn index_of(&self, file: &gio::File) -> Option<usize> {
let imp = self.imp();
let vec = imp.inner.borrow();

15
src/widgets/image_view.rs
View file

@ -254,17 +254,13 @@ impl LpImageView {
let carousel = imp.carousel.get();
for i in 1..=N_PAGES {
if let Some(ref file) = model.item(index + i).and_then(|o| o.downcast().ok()) {
if let Some(ref file) = model.file(index + i) {
carousel.append(&LpImagePage::from_file(file))
}
}
for i in 1..=N_PAGES {
if let Some(ref file) = index
.checked_sub(i)
.and_then(|i| model.item(i))
.and_then(|o| o.downcast().ok())
{
if let Some(ref file) = index.checked_sub(i).and_then(|i| model.file(i)) {
carousel.prepend(&LpImagePage::from_file(file))
}
}
@ -334,9 +330,7 @@ impl LpImageView {
let s = prev_index + N_PAGES + i + 1;
if s <= model.n_items() {
if let Some(ref file) =
model.item(s).and_then(|o| o.downcast::<gio::File>().ok())
{
if let Some(ref file) = model.file(s) {
carousel.append(&LpImagePage::from_file(file));
}
}
@ -354,8 +348,7 @@ impl LpImageView {
if let Some(ref file) = prev_index
.checked_sub(N_PAGES)
.and_then(|d| d.checked_sub(i + 1))
.and_then(|d| model.item(d))
.and_then(|i| i.downcast::<gio::File>().ok())
.and_then(|d| model.file(d))
{
carousel.prepend(&LpImagePage::from_file(file));
}