From c57dd3e0bb0a7ca3c28bfd02d85dcdd0c811f5a8 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 10 Dec 2024 16:22:17 +0100
Subject: [PATCH 1/2] Remove Reveal Focus

---
 .../Assets/ControlImages/RevealFocus.png      | Bin 4624 -> 0 bytes
 .../ControlPages/RevealFocusPage.xaml         | 252 ------------------
 .../ControlPages/RevealFocusPage.xaml.cs      | 141 ----------
 WinUIGallery/ControlPages/ScratchPadPage.xaml |  82 +++---
 WinUIGallery/DataModel/ControlInfoData.json   |  23 --
 5 files changed, 49 insertions(+), 449 deletions(-)
 delete mode 100644 WinUIGallery/Assets/ControlImages/RevealFocus.png
 delete mode 100644 WinUIGallery/ControlPages/RevealFocusPage.xaml
 delete mode 100644 WinUIGallery/ControlPages/RevealFocusPage.xaml.cs

diff --git a/WinUIGallery/Assets/ControlImages/RevealFocus.png b/WinUIGallery/Assets/ControlImages/RevealFocus.png
deleted file mode 100644
index d91277807227c4b32576f21f837b8fcde231a95c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4624
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
GLSTaF46lX&

diff --git a/WinUIGallery/ControlPages/RevealFocusPage.xaml b/WinUIGallery/ControlPages/RevealFocusPage.xaml
deleted file mode 100644
index 2492e0b7e..000000000
--- a/WinUIGallery/ControlPages/RevealFocusPage.xaml
+++ /dev/null
@@ -1,252 +0,0 @@
-<!--
-//*********************************************************
-//
-// Copyright (c) Microsoft. All rights reserved.
-// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
-// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
-// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
-//
-//*********************************************************
--->
-<Page x:Class="WinUIGallery.ControlPages.RevealFocusPage"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:WinUIGallery"
-      xmlns:local2="using:WinUIGallery.ControlPages"
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-      mc:Ignorable="d">
-
-    <StackPanel  XYFocusKeyboardNavigation="Enabled">
-        <StackPanel.Resources>
-            <SolidColorBrush x:Key="SystemControlRevealFocusVisualBrush" Color="{ThemeResource SystemAccentColorLight1}"/>
-
-            <Style x:Key="ButtonRevealCustomStyle" TargetType="Button" BasedOn="{StaticResource ButtonRevealStyle}">
-                <Setter Target="Width" Value="100"/>
-                <Setter Target="Height" Value="100"/>
-                <Setter Target="VerticalAlignment" Value="Center"/>
-                <Setter Target="Margin" Value="10"/>
-            </Style>
-
-            <Flyout x:Key="myPrimaryColorPickerFlyout">
-                <RelativePanel>
-                    <ColorPicker x:Name="myPrimaryColorPicker"
-                         IsColorChannelTextInputVisible="False"
-                         IsHexInputVisible="False"/>
-
-                    <Grid RelativePanel.Below="myPrimaryColorPicker"
-                          RelativePanel.AlignLeftWithPanel="True"
-                          RelativePanel.AlignRightWithPanel="True">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Button Content="Close" Click="confirmColor_Click"
-                        Margin="0,12,2,0" HorizontalAlignment="Stretch"/>
-                    </Grid>
-                </RelativePanel>
-            </Flyout>
-
-            <Flyout x:Key="mySecondaryColorPickerFlyout">
-                <RelativePanel>
-                    <ColorPicker x:Name="mySecondaryColorPicker"
-                         IsColorChannelTextInputVisible="False"
-                         IsHexInputVisible="False"
-                                 Color="{StaticResource SystemBaseHighColor}"/>
-
-                    <Grid RelativePanel.Below="mySecondaryColorPicker"
-                          RelativePanel.AlignLeftWithPanel="True"
-                          RelativePanel.AlignRightWithPanel="True">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Button Content="Close" Click="confirmColor_Click"
-                        Margin="0,12,2,0" HorizontalAlignment="Stretch"/>
-                    </Grid>
-                </RelativePanel>
-            </Flyout>
-        </StackPanel.Resources>
-
-        <TextBlock Margin="0,16,0,0">
-            Use the TAB key on your keyboard in the page below to see the focus visuals.
-        </TextBlock>
-
-        <local:ControlExample x:Name="Example1" HeaderText="Change the appearance of the focus rectangle.">
-
-            <StackPanel Orientation="Horizontal">
-                <Button Style="{StaticResource ButtonRevealCustomStyle}" AutomationProperties.Name="Square 1"/>
-                <Button Style="{StaticResource ButtonRevealCustomStyle}" AutomationProperties.Name="Square 2"/>
-                <Button Style="{StaticResource ButtonRevealCustomStyle}" AutomationProperties.Name="Square 3"/>
-            </StackPanel>
-
-            <local:ControlExample.Options>
-                <RadioButtons Header="FocusVisualKind:">
-                    <RadioButton x:Name="HighVisibility" Content="High Visibility" Checked="HighVisibility_Checked"/>
-                    <RadioButton x:Name="RevealFocus" Content="Reveal Focus"  Checked="RevealFocus_Checked"/>
-                </RadioButtons>
-            </local:ControlExample.Options>
-            <local:ControlExample.Xaml>
-                <x:String>
-                    &lt;Application FocusVisualKind="$(FocusVisualKind)"/&gt;
-                </x:String>
-            </local:ControlExample.Xaml>
-            <local:ControlExample.Substitutions>
-                <local:ControlExampleSubstitution x:Name="FocusVisualKindSubstitution" Key="FocusVisualKind" Value="HighVisibility" IsEnabled="True"/>
-            </local:ControlExample.Substitutions>
-        </local:ControlExample>
-
-        <TextBlock Margin="0,16,0,0" TextWrapping="WrapWholeWords">
-            <Bold>NOTE:</Bold> Choosing the <Bold>Reveal Focus</Bold> radio button will change the focus visuals that "UseSystemFocusVisuals" in the entire WinUI Gallery app.
-            Reveal focus should be used on Xbox only. Apps should use high visibility focus rectangles across all other form factors.
-        </TextBlock>
-
-        <local:ControlExample x:Name="Example2" HeaderText="Change the size of the focus rectangle." ActualThemeChanged="Example2_ActualThemeChanged">
-
-            <StackPanel>
-                <StackPanel Orientation="Horizontal">
-                    <Button x:Name="exampleButton" 
-                        AutomationProperties.Name="Square 4"
-                        Style="{StaticResource ButtonRevealCustomStyle}"
-                        FocusVisualMargin="{x:Bind local2:MyConverters.IntToThickness(marginSlider.Value), Mode=OneWay}"
-                        FocusVisualPrimaryThickness="{x:Bind local2:MyConverters.IntToThickness(primarySlider.Value), Mode=OneWay}"
-                        FocusVisualSecondaryThickness="{x:Bind local2:MyConverters.IntToThickness(secondarySlider.Value), Mode=OneWay}"
-                        FocusVisualPrimaryBrush="{x:Bind local2:MyConverters.ColorToBrush(myPrimaryColorPicker.Color), Mode=OneWay}"
-                        FocusVisualSecondaryBrush="{x:Bind local2:MyConverters.ColorToBrush(mySecondaryColorPicker.Color), Mode=OneWay}" />
-                    <Button
-                        Style="{StaticResource ButtonRevealCustomStyle}"
-                        AutomationProperties.Name="Square 5"
-                        FocusVisualMargin="{x:Bind local2:MyConverters.IntToThickness(marginSlider.Value), Mode=OneWay}"
-                        FocusVisualPrimaryThickness="{x:Bind local2:MyConverters.IntToThickness(primarySlider.Value), Mode=OneWay}"
-                        FocusVisualSecondaryThickness="{x:Bind local2:MyConverters.IntToThickness(secondarySlider.Value), Mode=OneWay}"
-                        FocusVisualPrimaryBrush="{x:Bind local2:MyConverters.ColorToBrush(myPrimaryColorPicker.Color), Mode=OneWay}"
-                        FocusVisualSecondaryBrush="{x:Bind local2:MyConverters.ColorToBrush(mySecondaryColorPicker.Color), Mode=OneWay}" />
-                    <Button
-                        Style="{StaticResource ButtonRevealCustomStyle}"
-                        AutomationProperties.Name="Square 6"
-                        FocusVisualMargin="{x:Bind local2:MyConverters.IntToThickness(marginSlider.Value), Mode=OneWay}"
-                        FocusVisualPrimaryThickness="{x:Bind local2:MyConverters.IntToThickness(primarySlider.Value), Mode=OneWay}"
-                        FocusVisualSecondaryThickness="{x:Bind local2:MyConverters.IntToThickness(secondarySlider.Value), Mode=OneWay}"
-                        FocusVisualPrimaryBrush="{x:Bind local2:MyConverters.ColorToBrush(myPrimaryColorPicker.Color), Mode=OneWay}"
-                        FocusVisualSecondaryBrush="{x:Bind local2:MyConverters.ColorToBrush(mySecondaryColorPicker.Color), Mode=OneWay}" />
-                </StackPanel>
-
-                <TextBox MinWidth="300" Margin="0,16,0,0" AutomationProperties.Name="Sample textBox"
-                    FocusVisualMargin="{x:Bind local2:MyConverters.IntToThickness(marginSlider.Value), Mode=OneWay}"
-                    FocusVisualPrimaryThickness="{x:Bind local2:MyConverters.IntToThickness(primarySlider.Value), Mode=OneWay}"
-                    FocusVisualSecondaryThickness="{x:Bind local2:MyConverters.IntToThickness(secondarySlider.Value), Mode=OneWay}"
-                    FocusVisualPrimaryBrush="{x:Bind local2:MyConverters.ColorToBrush(myPrimaryColorPicker.Color), Mode=OneWay}"
-                    FocusVisualSecondaryBrush="{x:Bind local2:MyConverters.ColorToBrush(mySecondaryColorPicker.Color), Mode=OneWay}"
-                         />
-
-                <ComboBox MinWidth="300" Margin="0,16,0,0" 
-                          AutomationProperties.Name="Sample"
-                          SelectedIndex="0"
-                          FocusVisualMargin="{x:Bind local2:MyConverters.IntToThickness(marginSlider.Value), Mode=OneWay}"
-                          FocusVisualPrimaryThickness="{x:Bind local2:MyConverters.IntToThickness(primarySlider.Value), Mode=OneWay}"
-                          FocusVisualSecondaryThickness="{x:Bind local2:MyConverters.IntToThickness(secondarySlider.Value), Mode=OneWay}"
-                          FocusVisualPrimaryBrush="{x:Bind local2:MyConverters.ColorToBrush(myPrimaryColorPicker.Color), Mode=OneWay}"
-                          FocusVisualSecondaryBrush="{x:Bind local2:MyConverters.ColorToBrush(mySecondaryColorPicker.Color), Mode=OneWay}">
-                    <ComboBoxItem>Apples</ComboBoxItem>
-                    <ComboBoxItem>Bananas</ComboBoxItem>
-                    <ComboBoxItem>Oranges</ComboBoxItem>
-                    <ComboBoxItem>Strawberries</ComboBoxItem>
-                </ComboBox>
-
-                <RatingControl Margin="5,16,0,0"
-                    AutomationProperties.Name="sample ratingControl"
-                    FocusVisualMargin="{x:Bind local2:MyConverters.IntToThickness(marginSlider.Value), Mode=OneWay}"
-                    FocusVisualPrimaryThickness="{x:Bind local2:MyConverters.IntToThickness(primarySlider.Value), Mode=OneWay}"
-                    FocusVisualSecondaryThickness="{x:Bind local2:MyConverters.IntToThickness(secondarySlider.Value), Mode=OneWay}"
-                    FocusVisualPrimaryBrush="{x:Bind local2:MyConverters.ColorToBrush(myPrimaryColorPicker.Color), Mode=OneWay}"
-                    FocusVisualSecondaryBrush="{x:Bind local2:MyConverters.ColorToBrush(mySecondaryColorPicker.Color), Mode=OneWay}"/>
-
-                <Slider MinWidth="300" Margin="5,16,0,0" IsFocusEngagementEnabled="True" 
-                    AutomationProperties.Name="Sample"
-                    FocusVisualMargin="{x:Bind local2:MyConverters.IntToThickness(marginSlider.Value), Mode=OneWay}"
-                    FocusVisualPrimaryThickness="{x:Bind local2:MyConverters.IntToThickness(primarySlider.Value), Mode=OneWay}"
-                    FocusVisualSecondaryThickness="{x:Bind local2:MyConverters.IntToThickness(secondarySlider.Value), Mode=OneWay}"
-                    FocusVisualPrimaryBrush="{x:Bind local2:MyConverters.ColorToBrush(myPrimaryColorPicker.Color), Mode=OneWay}"
-                    FocusVisualSecondaryBrush="{x:Bind local2:MyConverters.ColorToBrush(mySecondaryColorPicker.Color), Mode=OneWay}"/>
-
-                <TimePicker MinWidth="300" Margin="5,16,0,0" AutomationProperties.Name="Sample TimePicker"/>
-
-            </StackPanel>
-
-            <local:ControlExample.Options>
-                <StackPanel>
-                    <Slider x:Name="primarySlider" Header="Primary Thickness" MinWidth="50" Minimum="0"  Maximum="10" Value="2"/>
-                    <Slider x:Name="secondarySlider" Header="Secondary Thickness" MinWidth="50" Minimum="0"  Maximum="10" Value="1"/>
-                    <Slider x:Name="marginSlider" Header="Margin" MinWidth="50" Minimum="-20"  Maximum="20" Value="-3"/>
-                    <Button Content="Reset margin" Click="Button_Click" Margin="0,10"/>
-                    <Button Content="Move keyboard focus" Margin="0,24" Click="MoveFocusBtn_Click"/>
-
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition/>
-                            <ColumnDefinition/>
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                        </Grid.RowDefinitions>
-
-                        <TextBlock
-                            Text="Primary focus color:"
-                            VerticalAlignment="Center"/>
-                        <Button x:Name="primaryColorPickerButton"
-                                Grid.Column="1"
-                                AutomationProperties.Name="{x:Bind myPrimaryColorPicker.Color}"
-                                Background="{x:Bind local2:MyConverters.ColorToBrush(myPrimaryColorPicker.Color), Mode=OneWay}"
-                                Flyout="{StaticResource myPrimaryColorPickerFlyout}"
-                                Height="40"
-                                Width="40"
-                                Margin="10"
-                                HorizontalAlignment="Right"/>
-
-                        <TextBlock Grid.Row="1"
-                            Text="Secondary focus color:"
-                            VerticalAlignment="Center"/>
-                        <Button x:Name="secondaryColorPickerButton" 
-                                Grid.Column="1" Grid.Row="1"
-                                AutomationProperties.Name="{x:Bind myPrimaryColorPicker.Color}"
-                                Background="{x:Bind local2:MyConverters.ColorToBrush(mySecondaryColorPicker.Color), Mode=OneWay}"
-                                Flyout="{StaticResource mySecondaryColorPickerFlyout}"
-                                Height="40"
-                                Width="40"
-                                Margin="10"
-                                HorizontalAlignment="Right"/>
-                    </Grid>
-                </StackPanel>
-
-            </local:ControlExample.Options>
-            <local:ControlExample.Xaml>
-                <x:String xml:space="preserve">
-&lt;Grid.Resources&gt;
-          &lt;SolidColorBrush x:Key="$(PrimaryColorKey)" Color="$(PrimaryColor)" /&gt;
-          &lt;SolidColorBrush x:Key="SystemControlFocusVisualSecondaryBrush" Color="$(SecondaryColor)" /&gt;
-&lt;/Grid.Resources&gt;
-&lt;Button Width="100" Height="100"
-          FocusVisualPrimaryThickness="$(PrimaryThickness)"
-          FocusVisualSecondaryThickness="$(SecondaryThickness)"
-          FocusVisualMargin="$(Margin)"
-          FocusVisualPrimaryBrush="$(PrimaryBrush)"
-          FocusVisualSecondaryBrush="{StaticResource SystemControlFocusVisualSecondaryBrush}" /&gt;
-                </x:String>
-            </local:ControlExample.Xaml>
-            <local:ControlExample.Substitutions>
-                <local:ControlExampleSubstitution x:Name="primaryColorKeyText" Key="PrimaryColorKey" />
-                <local:ControlExampleSubstitution Key="PrimaryColor" Value="{x:Bind myPrimaryColorPicker.Color, Mode=OneWay}" />
-                <local:ControlExampleSubstitution Key="SecondaryColor" Value="{x:Bind mySecondaryColorPicker.Color, Mode=OneWay}" />
-                <local:ControlExampleSubstitution Key="PrimaryThickness" Value="{x:Bind primarySlider.Value, Mode=OneWay}" />
-                <local:ControlExampleSubstitution Key="SecondaryThickness" Value="{x:Bind secondarySlider.Value, Mode=OneWay}" />
-                <local:ControlExampleSubstitution Key="Margin" Value="{x:Bind marginSlider.Value, Mode=OneWay}" />
-                <local:ControlExampleSubstitution x:Name="primaryBrushText" Key="PrimaryBrush" />
-            </local:ControlExample.Substitutions>
-        </local:ControlExample>
-        <TextBlock Margin="0,16,0,0">
-            <Run>Notes:</Run>
-            The reveal glow will scale proportionally to the size of the <Bold>FocusVisualPrimaryThickness</Bold>.
-        </TextBlock>
-    </StackPanel>
-</Page>
diff --git a/WinUIGallery/ControlPages/RevealFocusPage.xaml.cs b/WinUIGallery/ControlPages/RevealFocusPage.xaml.cs
deleted file mode 100644
index 60961b283..000000000
--- a/WinUIGallery/ControlPages/RevealFocusPage.xaml.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-//*********************************************************
-//
-// Copyright (c) Microsoft. All rights reserved.
-// THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
-// ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
-// IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
-// PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
-//
-//*********************************************************
-using System;
-using Windows.Foundation.Metadata;
-using Microsoft.UI;
-using Microsoft.UI.Windowing;
-using Microsoft.UI.Xaml;
-using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
-
-namespace WinUIGallery.ControlPages
-{
-    public sealed partial class RevealFocusPage : Page
-    {
-        public RevealFocusPage()
-        {
-            this.InitializeComponent();
-
-            // DEMO ONLY: Initialize Color rectangles
-            if (Spring2018 && Application.Current.FocusVisualKind == FocusVisualKind.Reveal)
-            {
-                RevealFocus.IsChecked = true;
-                myPrimaryColorPicker.Color = (this.Resources["SystemControlRevealFocusVisualBrush"] as SolidColorBrush).Color;
-                mySecondaryColorPicker.Color = (this.Resources["SystemControlFocusVisualSecondaryBrush"] as SolidColorBrush).Color;
-                primaryColorPickerButton.Background = new SolidColorBrush(myPrimaryColorPicker.Color);
-                secondaryColorPickerButton.Background = new SolidColorBrush(mySecondaryColorPicker.Color);
-            }
-            else
-            {
-                HighVisibility.IsChecked = true;
-                primaryColorPickerButton.Background = new SolidColorBrush(myPrimaryColorPicker.Color);
-                secondaryColorPickerButton.Background = new SolidColorBrush(mySecondaryColorPicker.Color);
-            }
-        }
-
-        // DEMO ONLY: Change focus visual mode to high visibility
-        private void HighVisibility_Checked(object sender, RoutedEventArgs e)
-        {
-            if (exampleButton.ActualTheme == ElementTheme.Light)
-            {
-                myPrimaryColorPicker.Color = Colors.Black;
-                mySecondaryColorPicker.Color = Colors.White;
-            }
-            else if (exampleButton.ActualTheme == ElementTheme.Dark)
-            {
-                myPrimaryColorPicker.Color = Colors.White;
-                mySecondaryColorPicker.Color = Colors.Black;
-            }
-
-            primaryColorPickerButton.Background = new SolidColorBrush(myPrimaryColorPicker.Color);
-            primaryBrushText.Value = "{StaticResource SystemControlFocusVisualPrimaryBrush}";
-            primaryColorKeyText.Value = "SystemControlFocusVisualPrimaryBrush";
-            Application.Current.FocusVisualKind = FocusVisualKind.HighVisibility;
-            FocusVisualKindSubstitution.Value = "HighVisibility";
-        }
-
-        // DEMO ONLY: Change focus visual mode to reveal focus
-        private void RevealFocus_Checked(object sender, RoutedEventArgs e)
-        {
-            if (Spring2018)
-            {
-                myPrimaryColorPicker.Color = (this.Resources["SystemControlRevealFocusVisualBrush"] as SolidColorBrush).Color;
-                primaryColorPickerButton.Background = new SolidColorBrush(myPrimaryColorPicker.Color);
-                primaryBrushText.Value = "{StaticResource SystemControlRevealFocusVisualBrush}";
-                primaryColorKeyText.Value = "SystemControlRevealFocusVisualBrush";
-                Application.Current.FocusVisualKind = FocusVisualKind.Reveal;
-                FocusVisualKindSubstitution.Value = "Reveal";
-            }
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            // Draw the focus visuals at the edge of the control
-            // A negative FocusVisualMargin outsets the focus visual. A positive one insets the focus visual
-            marginSlider.Value = -1 * (primarySlider.Value + secondarySlider.Value);
-        }
-
-        private void confirmColor_Click(object sender, RoutedEventArgs e)
-        {
-            // DEMO ONLY: Set colors of the buttons to the selected color in ColorPicker
-            primaryColorPickerButton.Background = new SolidColorBrush(myPrimaryColorPicker.Color);
-            secondaryColorPickerButton.Background = new SolidColorBrush(mySecondaryColorPicker.Color);
-
-            // DEMO ONLY: Close the Flyout.
-            primaryColorPickerButton.Flyout.Hide();
-            secondaryColorPickerButton.Flyout.Hide();
-        }
-
-        /// <summary>
-        /// A property to identify if app is running on Spring2018 version of Windows
-        /// </summary>
-        public bool Spring2018
-        {
-            get
-            {
-                return ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 6);
-            }
-        }
-
-        private void Example2_ActualThemeChanged(FrameworkElement sender, object args)
-        {
-            if (Example2.ActualTheme == ElementTheme.Light)
-            {
-                myPrimaryColorPicker.Color = Colors.Black;
-                mySecondaryColorPicker.Color = Colors.White;
-            }
-            else if (Example2.ActualTheme == ElementTheme.Dark)
-            {
-                myPrimaryColorPicker.Color = Colors.White;
-                mySecondaryColorPicker.Color = Colors.Black;
-            }
-        }
-
-        private void MoveFocusBtn_Click(object sender, RoutedEventArgs e)
-        {
-            // Set focus to button for better preview/demo of customization
-            exampleButton.Focus(FocusState.Keyboard);
-        }
-    }
-
-    public class MyConverters
-    {
-        public static Thickness IntToThickness(double UniformLength)
-        {
-            return new Thickness(UniformLength);
-        }
-
-        public static SolidColorBrush ColorToBrush(Windows.UI.Color color)
-        {
-            return new SolidColorBrush(color);
-        }
-
-    }
-}
diff --git a/WinUIGallery/ControlPages/ScratchPadPage.xaml b/WinUIGallery/ControlPages/ScratchPadPage.xaml
index b4c2b2887..4bc3ee001 100644
--- a/WinUIGallery/ControlPages/ScratchPadPage.xaml
+++ b/WinUIGallery/ControlPages/ScratchPadPage.xaml
@@ -1,46 +1,62 @@
-<Page x:Class="WinUIGallery.ControlPages.ScratchPadPage"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:WinUIGallery"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:controls1="using:WinUIGallery.DesktopWap.Controls"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d">
+<Page
+    x:Class="WinUIGallery.ControlPages.ScratchPadPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls1="using:WinUIGallery.DesktopWap.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="using:WinUIGallery"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
     <Grid>
         <Grid RowDefinitions="*,*">
             <controls1:SampleThemeListener Grid.Row="0">
-                <ScrollViewer x:Name="scratchPad"
-                              Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
-                              HorizontalScrollMode="Auto"
-                              HorizontalScrollBarVisibility="Visible"
-                              VerticalScrollMode="Auto"
-                              />
+                <ScrollViewer
+                    x:Name="scratchPad"
+                    Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
+                    HorizontalScrollBarVisibility="Visible"
+                    HorizontalScrollMode="Auto"
+                    VerticalScrollMode="Auto" />
             </controls1:SampleThemeListener>
-            
+
             <Grid
+                Grid.Row="1"
+                Padding="10"
                 Background="{ThemeResource ExpanderContentBackground}"
-                BorderThickness="{ThemeResource ExpanderContentDownBorderThickness}"
                 BorderBrush="{ThemeResource ExpanderContentBorderBrush}"
+                BorderThickness="{ThemeResource ExpanderContentDownBorderThickness}"
                 CornerRadius="{ThemeResource ControlCornerRadius}"
-                Padding="10"
-                Grid.Row="1"
                 RowDefinitions="*, Auto"
                 RowSpacing="10">
-                <Grid ColumnDefinitions="*, Auto" Grid.Row="0" ColumnSpacing="10">
-                    <RichEditBox x:Name="textbox"
-                         FontFamily="Consolas"
-                         FontSize="13"
-                         AcceptsReturn="True"
-                         ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                         ScrollViewer.VerticalScrollBarVisibility="Auto"
-                         IsSpellCheckEnabled="False"
-                         PreviewKeyDown="textbox_PreviewKeyDown"
-                         KeyDown="textbox_KeyDown"
-                         PreviewKeyUp="textbox_PreviewKeyUp"
-                         TextChanged="textbox_TextChanged"
-                         ActualThemeChanged="textbox_ActualThemeChanged"
-                         AutomationProperties.Name="XAML markup textbox"/>
-                    <StackPanel Grid.Column="1" VerticalAlignment="Top" Spacing="10">
-                        <Button x:Name="loadButton" Content="Load" Click="LoadClick"/>
-                        <Button Content="Reset" ToolTipService.ToolTip="Resets to the default scratch pad content" Click="ResetToDefaultClick" />
+                <Grid
+                    Grid.Row="0"
+                    ColumnDefinitions="*, Auto"
+                    ColumnSpacing="10">
+                    <RichEditBox
+                        x:Name="textbox"
+                        AcceptsReturn="True"
+                        ActualThemeChanged="textbox_ActualThemeChanged"
+                        AutomationProperties.Name="XAML markup textbox"
+                        FontFamily="Consolas"
+                        FontSize="13"
+                        IsSpellCheckEnabled="False"
+                        KeyDown="textbox_KeyDown"
+                        PreviewKeyDown="textbox_PreviewKeyDown"
+                        PreviewKeyUp="textbox_PreviewKeyUp"
+                        ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                        ScrollViewer.VerticalScrollBarVisibility="Auto"
+                        TextChanged="textbox_TextChanged" />
+                    <StackPanel
+                        Grid.Column="1"
+                        VerticalAlignment="Top"
+                        Spacing="10">
+                        <Button
+                            x:Name="loadButton"
+                            Click="LoadClick"
+                            Content="Load" />
+                        <Button
+                            Click="ResetToDefaultClick"
+                            Content="Reset"
+                            ToolTipService.ToolTip="Resets to the default scratch pad content" />
                     </StackPanel>
                 </Grid>
                 <TextBlock x:Name="loadStatus" Grid.Row="1" />
diff --git a/WinUIGallery/DataModel/ControlInfoData.json b/WinUIGallery/DataModel/ControlInfoData.json
index 6e343707d..d6fc27907 100644
--- a/WinUIGallery/DataModel/ControlInfoData.json
+++ b/WinUIGallery/DataModel/ControlInfoData.json
@@ -2856,29 +2856,6 @@
             "ColorPaletteResources"
           ]
         },
-        {
-          "UniqueId": "RevealFocus",
-          "Title": "Reveal Focus",
-          "ApiNamespace": "Microsoft.UI.Xaml",
-          "Subtitle": "Customize the style of your focus rectangles.",
-          "ImagePath": "ms-appx:///Assets/ControlImages/RevealFocus.png",
-          "Description": "Reveal focus allows you to adapt focus rectangles to look like the focus rectangles available on Xbox.",
-          "Content": "<p>Look at the <i>RevealFocusPage.xaml</i> file in Visual Studio to see the full code for this page.</p>",
-          "IsUpdated": true,
-          "SourcePath": "/Materials/Reveal",
-          "Docs": [
-            {
-              "Title": "Reveal Focus - API",
-              "Uri": "https://learn.microsoft.com/windows/windows-app-sdk/api/winrt/microsoft.ui.xaml.application.focusvisualkind#Windows_UI_Xaml_Application_FocusVisualKind"
-            },
-            {
-              "Title": "Guidelines",
-              "Uri": "https://learn.microsoft.com/windows/apps/design/style/reveal-focus"
-            }
-          ],
-          "RelatedControls": [
-          ]
-        },
         {
           "UniqueId": "Shape",
           "Title": "Shape",

From f02284fe4ed3cda635e9ac220f7b577a68800b83 Mon Sep 17 00:00:00 2001
From: Niels Laute <niels.laute@live.nl>
Date: Tue, 10 Dec 2024 16:25:10 +0100
Subject: [PATCH 2/2] Update ContentIncludes.props

---
 WinUIGallery/ContentIncludes.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/WinUIGallery/ContentIncludes.props b/WinUIGallery/ContentIncludes.props
index 5e6212da1..ae325a930 100644
--- a/WinUIGallery/ContentIncludes.props
+++ b/WinUIGallery/ContentIncludes.props
@@ -84,7 +84,6 @@
     <Content Include="Assets\ControlImages\RatingControl.png" />
     <Content Include="Assets\ControlImages\RelativePanel.png" />
     <Content Include="Assets\ControlImages\RepeatButton.png" />
-    <Content Include="Assets\ControlImages\RevealFocus.png" />
     <Content Include="Assets\ControlImages\RichEditBox.png" />
     <Content Include="Assets\ControlImages\RichTextBlock.png" />
     <Content Include="Assets\ControlImages\ScratchPad.png" />