From 0ce64d053be11e928408393175851516bd253ccf Mon Sep 17 00:00:00 2001 From: "Michael Hawker MSFT (XAML Llama)" <24302614+michael-hawker@users.noreply.github.com> Date: Tue, 1 Nov 2022 09:59:47 -0700 Subject: [PATCH 1/4] Update version.json for 7.1.3 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index ed1032764e0..690df4db47d 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "7.1.3-build.{height}", + "version": "7.1.3", "publicReleaseRefSpec": [ "^refs/heads/main$", // we release out of main "^refs/heads/dev$", // we release out of dev From a48ad7212cec3f0ec2cbe0b33c1e08b4678e3f81 Mon Sep 17 00:00:00 2001 From: Filip Wallberg Date: Fri, 2 Jun 2023 20:45:56 +0700 Subject: [PATCH 2/4] Fixed issue with incremental loading not working when the height of the rows is lower than the --- .../DataGrid/DataGridRows.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs index 7146e112b26..63d3778fc86 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs @@ -135,7 +135,7 @@ private double EdgedRowsHeightCalculated // TODO: Update the DetailsHeightEstimate double totalDetailsHeight = detailsCount * this.RowDetailsHeightEstimate; double newEdgedRowsHeightCalculated = totalRowsHeight + totalDetailsHeight; - bool loadMoreDataFromIncrementalItemsSource = newEdgedRowsHeightCalculated < _oldEdgedRowsHeightCalculated; + bool loadMoreDataFromIncrementalItemsSource = newEdgedRowsHeightCalculated < _oldEdgedRowsHeightCalculated || (newEdgedRowsHeightCalculated == _oldEdgedRowsHeightCalculated && newEdgedRowsHeightCalculated < CellsHeight); _oldEdgedRowsHeightCalculated = newEdgedRowsHeightCalculated; From e2b76afe3d1c91cb94c68f078c02841559e911d5 Mon Sep 17 00:00:00 2001 From: Filip Wallberg Date: Fri, 2 Jun 2023 20:45:56 +0700 Subject: [PATCH 3/4] Fixed issue with incremental loading not working when the height of the rows is lower than the CellsHeight --- .../DataGrid/DataGridRows.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs index 7146e112b26..63d3778fc86 100644 --- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs +++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridRows.cs @@ -135,7 +135,7 @@ private double EdgedRowsHeightCalculated // TODO: Update the DetailsHeightEstimate double totalDetailsHeight = detailsCount * this.RowDetailsHeightEstimate; double newEdgedRowsHeightCalculated = totalRowsHeight + totalDetailsHeight; - bool loadMoreDataFromIncrementalItemsSource = newEdgedRowsHeightCalculated < _oldEdgedRowsHeightCalculated; + bool loadMoreDataFromIncrementalItemsSource = newEdgedRowsHeightCalculated < _oldEdgedRowsHeightCalculated || (newEdgedRowsHeightCalculated == _oldEdgedRowsHeightCalculated && newEdgedRowsHeightCalculated < CellsHeight); _oldEdgedRowsHeightCalculated = newEdgedRowsHeightCalculated; From 7a827fa08a93910b43cd071582a653343ce00af2 Mon Sep 17 00:00:00 2001 From: Filip Wallberg Date: Thu, 3 Aug 2023 13:43:00 +0700 Subject: [PATCH 4/4] Restored changes to version.json --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 690df4db47d..ed1032764e0 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "version": "7.1.3", + "version": "7.1.3-build.{height}", "publicReleaseRefSpec": [ "^refs/heads/main$", // we release out of main "^refs/heads/dev$", // we release out of dev