Remove unused code (#1572)

This PR removes screenshot mode and some MinimumContract checks that was UWP specific. Fixes #1569
microsoft · Jul 19, 2024 · 91032fd · 91032fd
1 parent a6613e4
commit 91032fd
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 357 deletions.
diff --git a/WinUIGallery/ControlPages/ComboBoxPage.xaml b/WinUIGallery/ControlPages/ComboBoxPage.xaml
@@ -1,4 +1,4 @@
-<!--
+<!--
 //*********************************************************
 //
 // Copyright (c) Microsoft. All rights reserved.
@@ -58,7 +58,7 @@
             </local:ControlExample.Xaml>
         </local:ControlExample>
 
-        <local:ControlExample HeaderText="An editable ComboBox." MinimumUniversalAPIContract="7">
+        <local:ControlExample HeaderText="An editable ComboBox.">
             <local:ControlExample.Example>
                 <StackPanel>
                     <ComboBox x:Name="Combo3" contract7Present:IsEditable="True" ItemsSource="{x:Bind FontSizes}" Header="Font Size" Width="200" Loaded="Combo3_Loaded"  />

diff --git a/WinUIGallery/ControlPages/RichEditBoxPage.xaml b/WinUIGallery/ControlPages/RichEditBoxPage.xaml
@@ -32,8 +32,7 @@
 
         <local:ControlExample HeaderText="Customizing RichEditBox's CommandBarFlyout - Adding 'Share'" 
                               XamlSource="Text\RichEditBox\RichEditBoxSample4_Xaml.txt"
-                              CSharpSource="Text\RichEditBox\RichEditBoxSample4_cs.txt"
-                              MinimumUniversalAPIContract="7">
+                              CSharpSource="Text\RichEditBox\RichEditBoxSample4_cs.txt">
             <RichEditBox x:Name="REBCustom" AutomationProperties.Name="editor with custom menu" 
                          Width="800" 
                          Height="200" 

diff --git a/WinUIGallery/ControlPages/StandardUICommandPage.xaml b/WinUIGallery/ControlPages/StandardUICommandPage.xaml
@@ -21,7 +21,6 @@
                               XamlSource="StandardUICommand\StandardUICommandSample1_xaml.txt"
                               CSharpSource="StandardUICommand\StandardUICommandSample1_cs.txt"
                               HorizontalContentAlignment="Stretch"
-                              MinimumUniversalAPIContract="7"
                               Loaded="ControlExample_Loaded">
             <Grid x:Name="rootGrid">
                 <Grid.RowDefinitions>

diff --git a/WinUIGallery/ControlPages/ToolTipPage.xaml b/WinUIGallery/ControlPages/ToolTipPage.xaml
@@ -50,7 +50,7 @@
             </local:ControlExample.Xaml>
         </local:ControlExample>
 
-        <local:ControlExample HeaderText="An Image with a ToolTip using PlacementRect." MinimumUniversalAPIContract="7">
+        <local:ControlExample HeaderText="An Image with a ToolTip using PlacementRect.">
             <local:ControlExample.Example>
                 <Image x:Name="textBoxToPlace" Source="/Assets/SampleMedia/cliff.jpg" Width="400" Height="266">
                     <ToolTipService.ToolTip>

diff --git a/WinUIGallery/ControlPages/XamlCompInteropPage.xaml b/WinUIGallery/ControlPages/XamlCompInteropPage.xaml
@@ -8,7 +8,7 @@
     mc:Ignorable="d">
 
     <StackPanel>
-        <local:ControlExample HeaderText="Use a natural motion composition animation on a UIElement"  Loaded="NaturalMotionExample_Loaded" MinimumUniversalAPIContract="7" CSharpSource="Motion/AnimationInterop/AnimationInteropSample1_cs.txt">
+        <local:ControlExample HeaderText="Use a natural motion composition animation on a UIElement"  Loaded="NaturalMotionExample_Loaded" CSharpSource="Motion/AnimationInterop/AnimationInteropSample1_cs.txt">
             <StackPanel VerticalAlignment="Stretch">
                 <TextBlock Text="Hover over the button to animate its scale." Style="{ThemeResource BodyTextBlockStyle}" Margin="0,0,0,12"  />
                 <Button Content="Item" Width="100" Height="50" PointerEntered="element_PointerEntered" PointerExited="element_PointerExited" />

diff --git a/WinUIGallery/ControlPages/XamlUICommandPage.xaml b/WinUIGallery/ControlPages/XamlUICommandPage.xaml
@@ -28,7 +28,6 @@
                               XamlSource="XamlUICommand\XamlUICommandSample1_xaml.txt"
                               CSharpSource="XamlUICommand\XamlUICommandSample1_cs.txt"
                               HorizontalContentAlignment="Stretch"
-                              MinimumUniversalAPIContract="7"
                               Loaded="ControlExample_Loaded">
             <Grid x:Name="rootGrid">
                 <Grid.RowDefinitions>

diff --git a/WinUIGallery/Controls/ControlExample.xaml b/WinUIGallery/Controls/ControlExample.xaml
@@ -36,7 +36,7 @@
                                          Duration="0:0:0.1" />
         </animations:ImplicitAnimationSet>
     </UserControl.Resources>
-    <Grid x:Name="rootGrid" Loaded="rootGrid_Loaded">
+    <Grid x:Name="rootGrid">
         <Grid.Resources>
             <ResourceDictionary>
                 <ResourceDictionary.ThemeDictionaries>
@@ -193,43 +193,6 @@
                     </Grid>
                 </Grid>
             </muxc:Expander>
-
-            <StackPanel
-                x:Name="ScreenshotControls"
-                Grid.Row="2"
-                Margin="0,6,0,0"
-                Orientation="Horizontal"
-                Spacing="6"
-                Visibility="Collapsed">
-                <Button
-                    x:Name="ScreenshotButton"
-                    HorizontalAlignment="Left"
-                    Click="ScreenshotButton_Click"
-                    Content="Take Screenshot" />
-
-                <Button
-                    x:Name="ScreenshotDelayButton"
-                    HorizontalAlignment="Left"
-                    Click="ScreenshotDelayButton_Click"
-                    Content="Take Screenshot With Delay" />
-
-                <TextBlock
-                    x:Name="ScreenshotStatusTextBlock"
-                    Margin="0,0,0,1"
-                    VerticalAlignment="Center" />
-
-                <TextBlock
-                    x:Name="PaddingLabel"
-                    Margin="5,0,5,1"
-                    VerticalAlignment="Center"
-                    Text="Padding:" />
-                <TextBox
-                    x:Name="ControlPaddingBox"
-                    Width="150"
-                    AutomationProperties.LabeledBy="{x:Bind PaddingLabel}"
-                    KeyUp="ControlPaddingBox_KeyUp"
-                    LostFocus="ControlPaddingBox_LostFocus" />
-            </StackPanel>
         </Grid>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup>
@@ -252,19 +215,6 @@
                     </VisualState.Setters>
                 </VisualState>
             </VisualStateGroup>
-
-            <VisualStateGroup>
-                <VisualState x:Name="NormalMode" />
-                <VisualState x:Name="ScreenshotMode">
-                    <VisualState.Setters>
-                        <Setter Target="CodeScrollViewer.Visibility" Value="Collapsed" />
-                        <Setter Target="ControlPresenter.Padding" Value="{ThemeResource ControlElementScreenshotModePadding}" />
-                        <Setter Target="ControlPresenter.HorizontalAlignment" Value="Center" />
-                        <Setter Target="ScreenshotControls.Visibility" Value="Visible" />
-                        <Setter Target="ExampleContainer.Background" Value="{ThemeResource SystemControlPageBackgroundBaseLowBrush}" />
-                    </VisualState.Setters>
-                </VisualState>
-            </VisualStateGroup>
         </VisualStateManager.VisualStateGroups>
     </Grid>
 </UserControl>