Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions Diffusion.Toolkit/Controls/ThumbnailView.xaml.Page.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,24 @@ public void ClearSelection()

public void ReloadThumbnailsView()
{
var wrapPanel = GetChildOfType<WrapPanel>(this)!;
var wrapPanel = GetChildOfType<WrapPanel>(this);

if (wrapPanel == null || wrapPanel.Children.Count == 0)
return;
return; // 🔐 Protects against out-of-range indexing here

var scrollViewer = GetChildOfType<ScrollViewer>(this)!;
var scrollViewer = GetChildOfType<ScrollViewer>(this);
if (scrollViewer == null)
return;

var offset = scrollViewer.VerticalOffset;

var height = scrollViewer.ViewportHeight;

var item = wrapPanel.Children[0] as ListViewItem;

// 🛡️ Additional verification
if (item == null)
return;

var preloadSize = item.ActualHeight * 2;

double top = 0;
Expand All @@ -121,7 +126,10 @@ public void ReloadThumbnailsView()
for (var i = 0; i < wrapPanel.Children.Count; i++)
{
item = wrapPanel.Children[i] as ListViewItem;


if (item == null)
continue; // 🛡️ Additional verification

if (top + item.ActualHeight >= (offset - preloadSize) && top <= (offset + height + preloadSize))
{
if (item?.DataContext is ImageEntry { LoadState: LoadState.Unloaded } imageEntry)
Expand Down
Loading