Skip to content

Improve Color page sample code #1653

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

Merged
niels9001 merged 4 commits into from
Dec 6, 2024
Merged

Improve Color page sample code #1653

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d728e7e
Use explicit sample code for the theme resource brush example
AndrewKeepCoding Nov 14, 2024
17d74af
Bring back description text
AndrewKeepCoding Nov 14, 2024
b399716
Show just the XAML example instead of wrapping it in an Expander
AndrewKeepCoding Nov 15, 2024
b78528b
Simplify XAML example code
AndrewKeepCoding Nov 15, 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
33 changes: 23 additions & 10 deletions WinUIGallery/ControlPages/DesignGuidance/ColorPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
x:Class="WinUIGallery.ControlPages.ColorPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:WinUIGallery.Controls"
xmlns:controls1="using:WinUIGallery.DesktopWap.Controls"
xmlns:core="using:WinUIGallery"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
Expand All @@ -14,22 +16,33 @@
<x:Double x:Key="TopNavigationViewPaneCustomContentMinWidth">0</x:Double>
</Page.Resources>

<Grid VerticalAlignment="Stretch">
<Grid
VerticalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<RichTextBlock>
<Paragraph>
<Run>The brushes below are part of WinUI 3. You can reference them in your app using:</Run>
<Run FontStyle="Italic">Foreground="{ThemeResource TextFillColorPrimaryBrush}"</Run>.
</Paragraph>
</RichTextBlock>
<TextBlock
Grid.Row="0"
Text="The brushes below are part of WinUI 3 and you can reference them in your app. For example:" />
<controls:SampleCodePresenter
x:Name="XamlPresenter"
Grid.Row="1"
Margin="0,16,0,16"
VerticalContentAlignment="Center"
SampleType="XAML">
<controls:SampleCodePresenter.Code>
<x:String xml:space="preserve">
&lt;TextBlock Text="..." Foreground="{ThemeResource TextFillColorPrimaryBrush}" /&gt;
</x:String>
</controls:SampleCodePresenter.Code>
</controls:SampleCodePresenter>
<SelectorBar
x:Name="PageSelector"
Grid.Row="1"
Margin="-12,32,0,0"
Grid.Row="2"
Margin="-12,0,0,0"
AutomationProperties.Name="PageSelector"
Loaded="PageSelector_Loaded"
SelectionChanged="PageSelector_SelectionChanged">
Expand All @@ -40,7 +53,7 @@
<SelectorBarItem Text="Signal" />
<SelectorBarItem Text="High Contrast" />
</SelectorBar>
<controls1:SampleThemeListener Grid.Row="2">
<controls1:SampleThemeListener Grid.Row="3">
<Frame x:Name="NavigationFrame" />
</controls1:SampleThemeListener>
</Grid>
Expand Down