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

optimize: keep filter opened while scrolling

Browse Source
This commit is contained in:
Tsanie Lily
2020-05-17 11:51:51 +08:00
parent d85c825737
commit fb19f9b3f3
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pixiview/Illust/IllustCollectionPage.cs
View File

@ -614,7 +614,7 @@ namespace Pixiview.Illust
private double lastRefreshY = double.MinValue; private double lastRefreshY = double.MinValue;
private double offset; private double offset;
protected bool ScrollingDown(double y) protected bool IsScrollingDown(double y)
{ {
return y > lastScrollY; return y > lastScrollY;
} }

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

@ -86,6 +86,7 @@ namespace Pixiview.Illust
private bool previousEnabled; private bool previousEnabled;
private bool dateEnabled; private bool dateEnabled;
private bool nextEnabled; private bool nextEnabled;
private ScrollDirection scrollDirection = ScrollDirection.Stop;
private bool isFilterVisible; private bool isFilterVisible;
private string lastQueryKey; private string lastQueryKey;
@ -229,6 +230,11 @@ namespace Pixiview.Illust
if (flag) if (flag)
{ {
isFilterVisible = true; isFilterVisible = true;
if (scrollDirection == ScrollDirection.Down)
{
// stop the scrolling
await scrollView.ScrollToAsync(0, scrollView.ScrollY, false);
}
await Task.WhenAll( await Task.WhenAll(
labelCaret.RotateTo(180, easing: Easing.CubicOut), labelCaret.RotateTo(180, easing: Easing.CubicOut),
gridFilter.TranslateTo(0, 0, easing: Easing.CubicOut), gridFilter.TranslateTo(0, 0, easing: Easing.CubicOut),
@ -324,14 +330,25 @@ namespace Pixiview.Illust
private void ScrollView_Scrolled(object sender, ScrolledEventArgs e) private void ScrollView_Scrolled(object sender, ScrolledEventArgs e)
{ {
var y = e.ScrollY; var y = e.ScrollY;
if (ScrollingDown(y)) if (IsScrollingDown(y))
{ {
if (scrollDirection != ScrollDirection.Down)
{
scrollDirection = ScrollDirection.Down;
}
// down // down
if (isFilterVisible) if (isFilterVisible)
{ {
ToggleFilterPanel(false); ToggleFilterPanel(false);
} }
} }
else
{
if (scrollDirection != ScrollDirection.Up)
{
scrollDirection = ScrollDirection.Up;
}
}
OnScrolled(y); OnScrolled(y);
} }