Skip to content

Commit 91c0044

Browse files
authored
nit: merge two StackPanels (#1421)
## Description nit: merge two StackPanels ## Motivation and Context No big deal, just a nit.
1 parent b5f81eb commit 91c0044

File tree

1 file changed

+46
-25
lines changed

1 file changed

+46
-25
lines changed

WinUIGallery/ControlPages/SemanticZoomPage.xaml

+46-25
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,81 @@
11
<!--
2-
//*********************************************************
3-
//
4-
// Copyright (c) Microsoft. All rights reserved.
5-
// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
6-
// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
7-
// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
8-
// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
9-
//
10-
//*********************************************************
2+
//*********************************************************
3+
//
4+
// Copyright (c) Microsoft. All rights reserved.
5+
// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
6+
// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
7+
// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
8+
// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
9+
//
10+
//*********************************************************
1111
-->
1212
<Page
1313
x:Class="AppUIBasics.ControlPages.SemanticZoomPage"
1414
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
15-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
16-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1715
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
18-
xmlns:local="using:AppUIBasics"
16+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
1917
xmlns:data="using:AppUIBasics.Data"
18+
xmlns:local="using:AppUIBasics"
19+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
2020
xmlns:wuxdata="using:Microsoft.UI.Xaml.Data"
2121
mc:Ignorable="d">
2222
<Page.Resources>
23-
<CollectionViewSource x:Name="cvsGroups" Source="{x:Bind Groups}" IsSourceGrouped="True" ItemsPath="Items"
24-
d:Source="{Binding Groups, Source={d:DesignData Source=/DataModel/ControlInfoData.json, Type=data:ControlInfoDataSource}}"/>
23+
<CollectionViewSource
24+
x:Name="cvsGroups"
25+
d:Source="{Binding Groups, Source={d:DesignData Source=/DataModel/ControlInfoData.json, Type=data:ControlInfoDataSource}}"
26+
IsSourceGrouped="True"
27+
ItemsPath="Items"
28+
Source="{x:Bind Groups}" />
2529

2630
<DataTemplate x:Key="ZoomedInTemplate" x:DataType="data:ControlInfoDataItem">
27-
<StackPanel Orientation="Horizontal" MinWidth="200" Margin="12,6,12,6">
28-
<StackPanel Margin="20,0,0,0">
29-
<TextBlock Text="{x:Bind Title}" Style="{StaticResource BaseTextBlockStyle}"/>
30-
<TextBlock Text="{x:Bind Subtitle}" TextWrapping="Wrap" HorizontalAlignment="Left" Width="300" Style="{StaticResource BodyTextBlockStyle}"/>
31-
</StackPanel>
31+
<StackPanel MinWidth="200" Margin="12,6,12,6">
32+
<TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{x:Bind Title}" />
33+
<TextBlock
34+
Width="300"
35+
HorizontalAlignment="Left"
36+
Style="{StaticResource BodyTextBlockStyle}"
37+
Text="{x:Bind Subtitle}"
38+
TextWrapping="Wrap" />
3239
</StackPanel>
3340
</DataTemplate>
3441

3542
<DataTemplate x:Key="ZoomedInGroupHeaderTemplate" x:DataType="data:ControlInfoDataGroup">
36-
<TextBlock Text="{x:Bind Title}" Foreground="{ThemeResource ApplicationForegroundThemeBrush}" Style="{StaticResource SubtitleTextBlockStyle}"/>
43+
<TextBlock
44+
Foreground="{ThemeResource ApplicationForegroundThemeBrush}"
45+
Style="{StaticResource SubtitleTextBlockStyle}"
46+
Text="{x:Bind Title}" />
3747
</DataTemplate>
3848

3949
<DataTemplate x:Key="ZoomedOutTemplate" x:DataType="wuxdata:ICollectionViewGroup">
40-
<TextBlock Text="{x:Bind ((data:ControlInfoDataGroup)Group).Title}" Style="{StaticResource SubtitleTextBlockStyle}" TextWrapping="Wrap"/>
50+
<TextBlock
51+
Style="{StaticResource SubtitleTextBlockStyle}"
52+
Text="{x:Bind ((data:ControlInfoDataGroup)Group).Title}"
53+
TextWrapping="Wrap" />
4154
</DataTemplate>
4255
</Page.Resources>
4356

4457
<StackPanel>
45-
<local:ControlExample HeaderText="A simple SemanticZoom" x:Name="Example1">
58+
<local:ControlExample x:Name="Example1" HeaderText="A simple SemanticZoom">
4659
<SemanticZoom x:Name="Control1" Height="500">
4760
<SemanticZoom.ZoomedInView>
48-
<GridView ItemsSource="{x:Bind cvsGroups.View}" ScrollViewer.IsHorizontalScrollChainingEnabled="False" SelectionMode="None" GotFocus="List_GotFocus"
49-
ItemTemplate="{StaticResource ZoomedInTemplate}">
61+
<GridView
62+
GotFocus="List_GotFocus"
63+
ItemTemplate="{StaticResource ZoomedInTemplate}"
64+
ItemsSource="{x:Bind cvsGroups.View}"
65+
ScrollViewer.IsHorizontalScrollChainingEnabled="False"
66+
SelectionMode="None">
5067
<GridView.GroupStyle>
5168
<GroupStyle HeaderTemplate="{StaticResource ZoomedInGroupHeaderTemplate}" />
5269
</GridView.GroupStyle>
5370
</GridView>
5471
</SemanticZoom.ZoomedInView>
5572

5673
<SemanticZoom.ZoomedOutView>
57-
<ListView ItemsSource="{x:Bind cvsGroups.View.CollectionGroups}" SelectionMode="None" ItemTemplate="{StaticResource ZoomedOutTemplate}" GotFocus="List_GotFocus" />
74+
<ListView
75+
GotFocus="List_GotFocus"
76+
ItemTemplate="{StaticResource ZoomedOutTemplate}"
77+
ItemsSource="{x:Bind cvsGroups.View.CollectionGroups}"
78+
SelectionMode="None" />
5879
</SemanticZoom.ZoomedOutView>
5980
</SemanticZoom>
6081
<local:ControlExample.Xaml>

0 commit comments

Comments
 (0)