Skip to content

Commit ffe05a5

Browse files
authored
Merge branch 'master' into optimization/struct-enumerators
2 parents 6ab3a27 + 5faa6aa commit ffe05a5

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/GridSplitter/GridSplitter.bind

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<!--Column Grid Splitter-->
7777
<controls:GridSplitter
7878
GripperCursor="@[GripperCursor:Enum:GripperCursorType.Default]"
79-
HorizontalAlignment="@[HorizontalAlignment:Enum:HorizontalAlignment.Left]"
79+
HorizontalAlignment="Left"
8080
Grid.Column="@[Column:Slider:1:0-2]"
8181
ResizeDirection="@[ResizeDirection:Enum:GridResizeDirection.Auto]"
8282
ResizeBehavior="@[ResizeBehavior:Enum:GridResizeBehavior.BasedOnAlignment]"

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Loading/LoadingCode.bind

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@
6060
</StackPanel>
6161
</ScrollViewer>
6262

63-
<controls:Loading x:Name="LoadingControl" HorizontalContentAlignment="@[HorizontalContentAlignment:Enum:HorizontalAlignment.Center:Left.Right.Center.Stretch]"
64-
VerticalContentAlignment="@[VerticalContentAlignment:Enum:VerticalAlignment.Center:Stretch.Center.Top.Bottom]">
63+
<controls:Loading x:Name="LoadingControl">
6564
<controls:Loading.Background>
6665
<SolidColorBrush Color="@[Background:Brush:Black]" Opacity="@[Background Opacity:DoubleSlider:0.7:0-1]" />
6766
</controls:Loading.Background>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/StaggeredPanel/StaggeredPanel.bind

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<GridView.ItemsPanel>
2727
<ItemsPanelTemplate>
2828
<controls:StaggeredPanel DesiredColumnWidth="@[DesiredColumnWidth:Slider:250:50-400]"
29-
HorizontalAlignment="@[HorizontalAlignment:Enum:HorizontalAlignment.Left]"
29+
HorizontalAlignment="Stretch"
3030
ColumnSpacing="@[ColumnSpacing:Slider:5:0-50]@"
3131
RowSpacing="@[RowSpacing:Slider:5:0-50]@" />
3232
</ItemsPanelTemplate>

0 commit comments

Comments
 (0)