Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nit: merge two StackPanels #1421

Merged
merged 2 commits into from
Jan 16, 2024
Merged

nit: merge two StackPanels #1421

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f44336
merge two StackPanels
Jay-o-Way Dec 24, 2023
591f25c
XAML Styler to trigger CI
Jay-o-Way Jan 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions WinUIGallery/ControlPages/SemanticZoomPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,15 @@
d:Source="{Binding Groups, Source={d:DesignData Source=/DataModel/ControlInfoData.json, Type=data:ControlInfoDataSource}}"/>

<DataTemplate x:Key="ZoomedInTemplate" x:DataType="data:ControlInfoDataItem">
<StackPanel Orientation="Horizontal" MinWidth="200" Margin="12,6,12,6">
<StackPanel Margin="20,0,0,0">
<TextBlock Text="{x:Bind Title}" Style="{StaticResource BaseTextBlockStyle}"/>
<TextBlock Text="{x:Bind Subtitle}" TextWrapping="Wrap" HorizontalAlignment="Left" Width="300" Style="{StaticResource BodyTextBlockStyle}"/>
</StackPanel>
</StackPanel>
</DataTemplate>
<StackPanel MinWidth="200" Margin="12,6,12,6">
<TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{x:Bind Title}" />
<TextBlock
Width="300"
HorizontalAlignment="Left"
Style="{StaticResource BodyTextBlockStyle}"
Text="{x:Bind Subtitle}"
TextWrapping="Wrap" />
</StackPanel> </DataTemplate>

<DataTemplate x:Key="ZoomedInGroupHeaderTemplate" x:DataType="data:ControlInfoDataGroup">
<TextBlock Text="{x:Bind Title}" Foreground="{ThemeResource ApplicationForegroundThemeBrush}" Style="{StaticResource SubtitleTextBlockStyle}"/>
Expand Down