Skip to content

Commit f9d2b77

Browse files
Avid29Arlodotexe
authored andcommitted
Fixed Segmented to properly prepare Segmentedtem containers Visual State in vertical Orientation
1 parent 4ed6d12 commit f9d2b77

File tree

1 file changed

+5
-18
lines changed

1 file changed

+5
-18
lines changed

components/Segmented/src/Segmented/Segmented.cs

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ public Segmented()
3030

3131
/// <inheritdoc/>
3232
protected override bool IsItemItsOwnContainerOverride(object item)
33-
{
34-
return item is SegmentedItem;
35-
}
33+
=> item is SegmentedItem;
3634

3735
/// <inheritdoc/>
3836
protected override void OnApplyTemplate()
3937
{
4038
base.OnApplyTemplate();
39+
4140
if (!_hasLoaded)
4241
{
4342
SelectedIndex = -1;
4443
SelectedIndex = _internalSelectedIndex;
4544
_hasLoaded = true;
4645
}
46+
4747
PreviewKeyDown -= Segmented_PreviewKeyDown;
4848
PreviewKeyDown += Segmented_PreviewKeyDown;
4949
}
@@ -52,9 +52,10 @@ protected override void OnApplyTemplate()
5252
protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
5353
{
5454
base.PrepareContainerForItemOverride(element, item);
55+
5556
if (element is SegmentedItem segmentedItem)
5657
{
57-
segmentedItem.Loaded += SegmentedItem_Loaded;
58+
segmentedItem.UpdateOrientation(Orientation);
5859
}
5960
}
6061

@@ -67,20 +68,6 @@ private void Segmented_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
6768
}
6869
}
6970

70-
private void SegmentedItem_Loaded(object sender, RoutedEventArgs e)
71-
{
72-
if (sender is SegmentedItem segmentedItem)
73-
{
74-
segmentedItem.Loaded -= SegmentedItem_Loaded;
75-
}
76-
}
77-
78-
/// <inheritdoc/>
79-
protected override void OnItemsChanged(object e)
80-
{
81-
base.OnItemsChanged(e);
82-
}
83-
8471
private enum MoveDirection
8572
{
8673
Next,

0 commit comments

Comments
 (0)