tsanie/Pixiview
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

optimize: flow measure and layout

Browse Source
This commit is contained in:
Tsanie Lily
2020-05-16 22:45:22 +08:00
parent 623410b47c
commit 7bb3c34fd5
5 changed files with 100 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Pixiview/Illust/IllustCollectionPage.cs
View File

@@ -7,6 +7,7 @@ using Pixiview.Resources;
using Pixiview.UI;
using Pixiview.UI.Theme;
using Pixiview.Utils;
using Xamarin.Essentials;
using Xamarin.Forms;
namespace Pixiview.Illust
@@ -613,12 +614,13 @@ namespace Pixiview.Illust
if (now == null)
{
now = collection;
IllustCollection = now;
}
else
{
now = new IllustCollection(now.Concat(collection));
//now = new IllustCollection(now.Concat(collection));
now.AddRange(collection);
}
IllustCollection = now;
return now;
}
@@ -652,7 +654,7 @@ namespace Pixiview.Illust
Down
}
public class IllustCollection : List<IllustItem>
public class IllustCollection : List<IllustItem>, IIllustCollectionChanged
{
private static IllustCollection empty;
@@ -668,6 +670,8 @@ namespace Pixiview.Illust
}
}
public event EventHandler<CollectionChangedEventArgs> CollectionChanged;
public IllustCollection() : base()
{
running = true;
@@ -677,8 +681,28 @@ namespace Pixiview.Illust
running = true;
}
public void AddRange(List<IllustItem> items)
{
var e = new CollectionChangedEventArgs
{
NewStartingIndex = Count,
NewItems = items
};
base.AddRange(items);
if (MainThread.IsMainThread)
{
CollectionChanged?.Invoke(this, e);
}
else
{
MainThread.BeginInvokeOnMainThread(() =>
CollectionChanged?.Invoke(this, e));
}
}
private readonly object sync = new object();
private volatile bool running;
public bool Running
{
get => running;

5
Pixiview/Illust/RankingPage.xaml.cs
View File

@@ -307,10 +307,7 @@ namespace Pixiview.Illust
private void FlowLayout_MaxHeightChanged(object sender, HeightEventArgs e)
{
if (e.ContentHeight > 0)
{
SetOffset(e.ContentHeight - scrollView.Bounds.Height - SCROLL_OFFSET);
}
SetOffset(e.ContentHeight - scrollView.Bounds.Height - SCROLL_OFFSET);
}
protected override bool CheckRefresh()

5
Pixiview/Illust/RelatedIllustsPage.xaml.cs
View File

@@ -72,10 +72,7 @@ namespace Pixiview.Illust
private void FlowLayout_MaxHeightChanged(object sender, HeightEventArgs e)
{
if (e.ContentHeight > 0)
{
SetOffset(e.ContentHeight - scrollView.Bounds.Height - SCROLL_OFFSET);
}
SetOffset(e.ContentHeight - scrollView.Bounds.Height - SCROLL_OFFSET);
}
protected override bool CheckRefresh()

5
Pixiview/Illust/UserIllustPage.xaml.cs
View File

@@ -82,10 +82,7 @@ namespace Pixiview.Illust
private void FlowLayout_MaxHeightChanged(object sender, HeightEventArgs e)
{
if (e.ContentHeight > 0)
{
SetOffset(e.ContentHeight - scrollView.Bounds.Height - SCROLL_OFFSET);
}
SetOffset(e.ContentHeight - scrollView.Bounds.Height - SCROLL_OFFSET);
}
protected override bool CheckRefresh()