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

Remove unused code #1572

Merged
merged 1 commit into from
Jul 19, 2024
Merged

Remove unused code #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions WinUIGallery/ControlPages/ComboBoxPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
//*********************************************************
//
// Copyright (c) Microsoft. All rights reserved.
Expand Down Expand Up @@ -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" />
Expand Down
3 changes: 1 addition & 2 deletions WinUIGallery/ControlPages/RichEditBoxPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion WinUIGallery/ControlPages/StandardUICommandPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/ControlPages/ToolTipPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion WinUIGallery/ControlPages/XamlCompInteropPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 0 additions & 1 deletion WinUIGallery/ControlPages/XamlUICommandPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
52 changes: 1 addition & 51 deletions WinUIGallery/Controls/ControlExample.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Loading