Skip to content

Commit e46bdde

Browse files
RosuavioRosuavio
committed
Raname ItemPlacement to ScrollItemPlacement
1 parent 05e250c commit e46bdde

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,7 @@ private static Type LookForTypeByName(string typeName)
675675

676676
// TODO Reintroduce graph controls
677677
// typeof(UserToPersonConverter)) // Search in Microsoft.Toolkit.Graph.Controls
678-
ItemPlacement.Default.GetType(), // Search in Microsoft.Toolkit.Uwp.UI
678+
ScrollItemPlacement.Default.GetType(), // Search in Microsoft.Toolkit.Uwp.UI
679679
EasingType.Default.GetType(), // Microsoft.Toolkit.Uwp.UI.Animations
680680
ImageBlendMode.Multiply.GetType(), // Search in Microsoft.Toolkit.Uwp.UI.Media
681681
Interaction.Enabled.GetType(), // Microsoft.Toolkit.Uwp.Input.GazeInteraction

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsCode.bind

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.Toolkit.Uwp.UI;
44

55
// Scrolling with index
6-
await MyGridView.SmoothScrollIntoViewWithIndexAsync(index: int, itemPlacement: ItemPlacement, disableAnimation: bool, scrollIfVisibile: bool, additionalHorizontalOffset: int, additionalVerticalOffset: int);
6+
await MyGridView.SmoothScrollIntoViewWithIndexAsync(index: int, itemPlacement: ScrollItemPlacement, disableAnimation: bool, scrollIfVisibile: bool, additionalHorizontalOffset: int, additionalVerticalOffset: int);
77

88
// Scrolling with item
9-
await MyGridView.SmoothScrollIntoViewWithItemAsync(item: object, itemPlacement: ItemPlacement, disableAnimation: bool, scrollIfVisibile: bool, additionalHorizontalOffset: int, additionalVerticalOffset: int);
9+
await MyGridView.SmoothScrollIntoViewWithItemAsync(item: object, itemPlacement: ScrollItemPlacement, disableAnimation: bool, scrollIfVisibile: bool, additionalHorizontalOffset: int, additionalVerticalOffset: int);

‎Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ private void Load()
4242
var index = int.TryParse(IndexInput.Text, out var i) ? i : 0;
4343
var itemPlacement = ItemPlacementInput.SelectedItem switch
4444
{
45-
"Default" => ItemPlacement.Default,
46-
"Left" => ItemPlacement.Left,
47-
"Top" => ItemPlacement.Top,
48-
"Center" => ItemPlacement.Center,
49-
"Right" => ItemPlacement.Right,
50-
"Bottom" => ItemPlacement.Bottom,
51-
_ => ItemPlacement.Default
45+
"Default" => ScrollItemPlacement.Default,
46+
"Left" => ScrollItemPlacement.Left,
47+
"Top" => ScrollItemPlacement.Top,
48+
"Center" => ScrollItemPlacement.Center,
49+
"Right" => ScrollItemPlacement.Right,
50+
"Bottom" => ScrollItemPlacement.Bottom,
51+
_ => ScrollItemPlacement.Default
5252
};
5353

5454
var disableAnimation = DisableAnimationInput.IsChecked ?? false;

‎Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ListViewExtensions.SmoothScrollIntoView.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public static partial class ListViewExtensions
2727
/// <param name="additionalHorizontalOffset">Adds additional horizontal offset</param>
2828
/// <param name="additionalVerticalOffset">Adds additional vertical offset</param>
2929
/// <returns>Note: Even though this return <see cref="Task"/>, it will not wait until the scrolling completes</returns>
30-
public static async Task SmoothScrollIntoViewWithIndexAsync(this ListViewBase listViewBase, int index, ItemPlacement itemPlacement = ItemPlacement.Default, bool disableAnimation = false, bool scrollIfVisible = true, int additionalHorizontalOffset = 0, int additionalVerticalOffset = 0)
30+
public static async Task SmoothScrollIntoViewWithIndexAsync(this ListViewBase listViewBase, int index, ScrollItemPlacement itemPlacement = ScrollItemPlacement.Default, bool disableAnimation = false, bool scrollIfVisible = true, int additionalHorizontalOffset = 0, int additionalVerticalOffset = 0)
3131
{
3232
if (index > (listViewBase.Items.Count - 1))
3333
{
@@ -122,7 +122,7 @@ public static async Task SmoothScrollIntoViewWithIndexAsync(this ListViewBase li
122122
{
123123
switch (itemPlacement)
124124
{
125-
case ItemPlacement.Default:
125+
case ScrollItemPlacement.Default:
126126
if (previousXOffset <= maxXPosition && previousXOffset >= minXPosition)
127127
{
128128
finalXPosition = previousXOffset + additionalHorizontalOffset;
@@ -151,29 +151,29 @@ public static async Task SmoothScrollIntoViewWithIndexAsync(this ListViewBase li
151151

152152
break;
153153

154-
case ItemPlacement.Left:
154+
case ScrollItemPlacement.Left:
155155
finalXPosition = maxXPosition + additionalHorizontalOffset;
156156
finalYPosition = previousYOffset + additionalVerticalOffset;
157157
break;
158158

159-
case ItemPlacement.Top:
159+
case ScrollItemPlacement.Top:
160160
finalXPosition = previousXOffset + additionalHorizontalOffset;
161161
finalYPosition = maxYPosition + additionalVerticalOffset;
162162
break;
163163

164-
case ItemPlacement.Center:
164+
case ScrollItemPlacement.Center:
165165
var centreX = (listViewBaseWidth - selectorItemWidth) / 2.0;
166166
var centreY = (listViewBaseHeight - selectorItemHeight) / 2.0;
167167
finalXPosition = maxXPosition - centreX + additionalHorizontalOffset;
168168
finalYPosition = maxYPosition - centreY + additionalVerticalOffset;
169169
break;
170170

171-
case ItemPlacement.Right:
171+
case ScrollItemPlacement.Right:
172172
finalXPosition = minXPosition + additionalHorizontalOffset;
173173
finalYPosition = previousYOffset + additionalVerticalOffset;
174174
break;
175175

176-
case ItemPlacement.Bottom:
176+
case ScrollItemPlacement.Bottom:
177177
finalXPosition = previousXOffset + additionalHorizontalOffset;
178178
finalYPosition = minYPosition + additionalVerticalOffset;
179179
break;
@@ -199,7 +199,7 @@ public static async Task SmoothScrollIntoViewWithIndexAsync(this ListViewBase li
199199
/// <param name="additionalHorizontalOffset">Adds additional horizontal offset</param>
200200
/// <param name="additionalVerticalOffset">Adds additional vertical offset</param>
201201
/// <returns>Note: Even though this return <see cref="Task"/>, it will not wait until the scrolling completes</returns>
202-
public static async Task SmoothScrollIntoViewWithItemAsync(this ListViewBase listViewBase, object item, ItemPlacement itemPlacement = ItemPlacement.Default, bool disableAnimation = false, bool scrollIfVisibile = true, int additionalHorizontalOffset = 0, int additionalVerticalOffset = 0)
202+
public static async Task SmoothScrollIntoViewWithItemAsync(this ListViewBase listViewBase, object item, ScrollItemPlacement itemPlacement = ScrollItemPlacement.Default, bool disableAnimation = false, bool scrollIfVisibile = true, int additionalHorizontalOffset = 0, int additionalVerticalOffset = 0)
203203
{
204204
await SmoothScrollIntoViewWithIndexAsync(listViewBase, listViewBase.Items.IndexOf(item), itemPlacement, disableAnimation, scrollIfVisibile, additionalHorizontalOffset, additionalVerticalOffset);
205205
}

‎Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ItemPlacement.cs renamed to ‎Microsoft.Toolkit.Uwp.UI/Extensions/ListViewBase/ScrollItemPlacement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Microsoft.Toolkit.Uwp.UI
77
/// <summary>
88
/// Item Position
99
/// </summary>
10-
public enum ItemPlacement
10+
public enum ScrollItemPlacement
1111
{
1212
/// <summary>
1313
/// If visible then it will not scroll, if not then item will be aligned to the nearest edge

0 commit comments

Comments
 (0)