chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #566 from irihitech/page

Browse Source 
Fix pagination initialization issue.
This commit is contained in:
Dong Bin
2025-02-27 14:10:50 +08:00
committed by GitHub
parent c2661a5a27 021225dc1c
commit 55031c58c7
3 changed files with 448 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Ursa/Controls/Pagination/Pagination.cs
View File

@@ -166,7 +166,11 @@ public class Pagination : TemplatedControl
private static int? CoerceCurrentPage(AvaloniaObject arg1, int? arg2)
{
if (arg2 is null) return null;
if (arg1 is Pagination p) arg2 = MathHelpers.SafeClamp(arg2.Value, 1, p.PageCount);
// Only coerce the value if the pagination is initialized. Otherwise the value will be coerced to default because PageCount is not yet determined.
if (arg1 is Pagination { IsInitialized: true } p)
{
arg2 = MathHelpers.SafeClamp(arg2.Value, 1, p.PageCount);
}
return arg2;
}
@@ -193,6 +197,7 @@ public class Pagination : TemplatedControl
private void OnPageSizeChanged(AvaloniaPropertyChangedEventArgs<int> args)
{
if (!IsInitialized) return;
var pageCount = TotalCount / args.NewValue.Value;
var residue = TotalCount % args.NewValue.Value;
if (residue > 0) pageCount++;
@@ -218,7 +223,8 @@ public class Pagination : TemplatedControl
LostFocusEvent.AddHandler(OnQuickJumpInputLostFocus, _quickJumpInput);
InitializePanelButtons();
UpdateButtonsByCurrentPage(0);
CurrentPage = MathHelpers.SafeClamp(CurrentPage ?? 1, 1, PageCount);
UpdateButtonsByCurrentPage(CurrentPage);
}
private void OnQuickJumpInputKeyDown(object? sender, KeyEventArgs e)
@@ -300,16 +306,15 @@ public class Pagination : TemplatedControl
{
if (PageSize == 0) return;
var pageCount = TotalCount / PageSize;
var currentPage = CurrentPage;
var residue = TotalCount % PageSize;
if (residue > 0) pageCount++;
if (_buttonPanel is null)
{
SetCurrentValue(PageCountProperty, pageCount);
return;
}
var currentPage = CurrentPage;
var residue = TotalCount % PageSize;
if (residue > 0) pageCount++;
if (pageCount <= 7)
{
for (var i = 0; i < 7; i++)