CommunityToolkit
/
WindowsCommunityToolkit
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Renamed "uwpui" XML namespace to "ui"

This commit is contained in:
Sergio Pedri 2021-02-09 14:27:30 +01:00
Родитель a91097cdf1
Коммит 1f3ff5d318
25 изменённых файлов: 127 добавлений и 127 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml
Просмотреть файл

@ -4,7 +4,7 @@
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:sampleapp="using:Microsoft.Toolkit.Uwp.SampleApp"
@ -74,7 +74,7 @@
</Page.Resources>
<Grid x:Name="Root"
uwpui:VisualExtensions.NormalizedCenterPoint="0.5"
ui:VisualExtensions.NormalizedCenterPoint="0.5"
Visibility="Collapsed">
<controls:DropShadowPanel x:Name="DropShadow"
HorizontalAlignment="Center"
@ -92,7 +92,7 @@
<Border x:Name="RightBorder"
Grid.Column="1"
uwpui:VisualExtensions.NormalizedCenterPoint="0, 0.5"
ui:VisualExtensions.NormalizedCenterPoint="0, 0.5"
Background="{ThemeResource Background-AboutPage-SidePane}">
<animations:Implicit.ShowAnimations>
<animations:ScaleAnimation From="0, 1, 0"

4
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ClipToBounds/ClipToBoundsPage.xaml
Просмотреть файл

@ -3,11 +3,11 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid x:Name="TargetObject"
uwpui:UIElementExtensions.ClipToBounds="True"/>
ui:UIElementExtensions.ClipToBounds="True"/>
</Page>

6
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/EnumValuesExtension/EnumValuesExtensionPage.xaml
Просмотреть файл

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:enums="using:Microsoft.Toolkit.Uwp.SampleApp.Enums"
xmlns:converters="using:Microsoft.Toolkit.Uwp.SampleApp.Converters"
mc:Ignorable="d">
@ -13,8 +13,8 @@
</Page.Resources>
<Grid>
<StackPanel Spacing="8">
<ComboBox ItemsSource="{uwpui:EnumValues Type=enums:Animal}"/>
<ComboBox ItemsSource="{uwpui:EnumValues Type=enums:Animal}"
<ComboBox ItemsSource="{ui:EnumValues Type=enums:Animal}"/>
<ComboBox ItemsSource="{ui:EnumValues Type=enums:Animal}"
SelectedIndex="0">
<ComboBox.ItemTemplate>
<DataTemplate>

4
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/FrameworkElementExtensions/FrameworkElementExtensionsPage.xaml
Просмотреть файл

@ -2,12 +2,12 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Rectangle x:Name="TargetObject"
uwpui:FrameworkElementExtensions.EnableActualSizeBinding="true"
ui:FrameworkElementExtensions.EnableActualSizeBinding="true"
Fill="{ThemeResource Brush-Main}"
Stroke="{ThemeResource Brush-Grey-04}"
StrokeThickness="1" />

14
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/IconExtensions/IconExtensionsPage.xaml
Просмотреть файл

@ -3,22 +3,22 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
mc:Ignorable="d">
<Grid>
<StackPanel>
<CommandBar>
<AppBarButton Icon="{uwpui:FontIcon Glyph=&#xE102;}"/>
<AppBarButton Icon="{uwpui:SymbolIcon Symbol=Play}"/>
<AppBarButton Icon="{ui:FontIcon Glyph=&#xE102;}"/>
<AppBarButton Icon="{ui:SymbolIcon Symbol=Play}"/>
</CommandBar>
<SwipeControl>
<SwipeControl.LeftItems>
<SwipeItems Mode="Reveal">
<SwipeItem Text="Accept" IconSource="{uwpui:FontIconSource Glyph=&#xE10B;}"/>
<SwipeItem Text="Play" IconSource="{uwpui:SymbolIconSource Symbol=Play}"/>
<SwipeItem IconSource="{uwpui:BitmapIconSource Source=/Assets/ToolkitLogo.png}"/>
<SwipeItem Text="Accept" IconSource="{ui:FontIconSource Glyph=&#xE10B;}"/>
<SwipeItem Text="Play" IconSource="{ui:SymbolIconSource Symbol=Play}"/>
<SwipeItem IconSource="{ui:BitmapIconSource Source=/Assets/ToolkitLogo.png}"/>
</SwipeItems>
</SwipeControl.LeftItems>
</SwipeControl>
@ -26,7 +26,7 @@
<Button>
<Button.Flyout>
<MenuFlyout>
<MenuFlyoutItem Icon="{uwpui:BitmapIcon Source=/Assets/ToolkitLogo.png}" />
<MenuFlyoutItem Icon="{ui:BitmapIcon Source=/Assets/ToolkitLogo.png}" />
</MenuFlyout>
</Button.Flyout>
</Button>

4
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Implicit Animations/ImplicitAnimationsPage.xaml
Просмотреть файл

@ -4,7 +4,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
mc:Ignorable="d">
<Page.Resources>
@ -34,7 +34,7 @@
<!-- Need to have an placeholder of each element so they can be used in the XAML editor -->
<Grid uwpui:VisualExtensions.CenterPoint="50,50,0">
<Grid ui:VisualExtensions.CenterPoint="50,50,0">
<animations:Implicit.ShowAnimations>
<animations:OpacityAnimation From="0" To="1"/>
</animations:Implicit.ShowAnimations>

10
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListViewExtensions/ListViewExtensionsPage.xaml
Просмотреть файл

@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
@ -22,10 +22,10 @@
<ListView x:Name="SampleListView"
Margin="12"
uwpui:ListViewExtensions.AlternateColor="#33AAAAAA"
uwpui:ListViewExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}"
uwpui:ListViewExtensions.Command="{Binding SampleCommand}"
uwpui:ListViewExtensions.StretchItemContainerDirection="Both"
ui:ListViewExtensions.AlternateColor="#33AAAAAA"
ui:ListViewExtensions.AlternateItemTemplate="{StaticResource AlternateTemplate}"
ui:ListViewExtensions.Command="{Binding SampleCommand}"
ui:ListViewExtensions.StretchItemContainerDirection="Both"
IsItemClickEnabled="True"
ItemTemplate="{StaticResource NormalTemplate}" />
</Grid>

8
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Mouse/MouseCursorPage.xaml
Просмотреть файл

@ -1,7 +1,7 @@
<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.MouseCursorPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI">
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
<Grid>
<Border Width="220"
@ -9,7 +9,7 @@
Margin="50,100,20,20"
HorizontalAlignment="Left"
VerticalAlignment="Top"
uwpui:FrameworkElementExtensions.Cursor="UniversalNo"
ui:FrameworkElementExtensions.Cursor="UniversalNo"
Background="DeepSkyBlue">
<TextBlock Margin="4"
HorizontalAlignment="Center"
@ -22,7 +22,7 @@
Margin="20"
HorizontalAlignment="Left"
VerticalAlignment="Top"
uwpui:FrameworkElementExtensions.Cursor="Wait"
ui:FrameworkElementExtensions.Cursor="Wait"
Background="Orange">
<TextBlock Margin="4"
HorizontalAlignment="Center"
@ -38,7 +38,7 @@
<Button Margin="20,290,20,20"
HorizontalAlignment="Left"
VerticalAlignment="Top"
uwpui:FrameworkElementExtensions.Cursor="Hand"
ui:FrameworkElementExtensions.Cursor="Hand"
Content="Button with Hand cursor, just like on web" />
</Grid>
</Page>

4
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ScrollViewerExtensions/ScrollViewerExtensionsPage.xaml
Просмотреть файл

@ -4,7 +4,7 @@
xmlns:behaviors="using:Microsoft.Toolkit.Uwp.UI.Behaviors"
xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
@ -15,7 +15,7 @@
<Grid>
<ListView Name="listView"
uwpui:ScrollViewerExtensions.VerticalScrollBarMargin="{Binding MinHeight, ElementName=MyHeaderGrid, Converter={StaticResource DoubleTopThicknessConverter}}">
ui:ScrollViewerExtensions.VerticalScrollBarMargin="{Binding MinHeight, ElementName=MyHeaderGrid, Converter={StaticResource DoubleTopThicknessConverter}}">
<interactivity:Interaction.Behaviors>
<behaviors:StickyHeaderBehavior />
</interactivity:Interaction.Behaviors>

18
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/SurfaceDialTextbox/SurfaceDialTextboxPage.xaml
Просмотреть файл

@ -3,18 +3,18 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
mc:Ignorable="d">
<!-- Shallow Copy -->
<Grid>
<TextBox uwpui:TextBoxExtensions.StepValue="1.0"
uwpui:TextBoxExtensions.ForceMenuItem="True"
uwpui:TextBoxExtensions.EnableHapticFeedback="True"
uwpui:TextBoxExtensions.EnableMinMaxValue="True"
uwpui:TextBoxExtensions.MinValue="0"
uwpui:TextBoxExtensions.MaxValue="100"
uwpui:TextBoxExtensions.Icon="Ruler"
uwpui:TextBoxExtensions.EnableTapToNextControl="True" />
<TextBox ui:TextBoxExtensions.StepValue="1.0"
ui:TextBoxExtensions.ForceMenuItem="True"
ui:TextBoxExtensions.EnableHapticFeedback="True"
ui:TextBoxExtensions.EnableMinMaxValue="True"
ui:TextBoxExtensions.MinValue="0"
ui:TextBoxExtensions.MaxValue="100"
ui:TextBoxExtensions.Icon="Ruler"
ui:TextBoxExtensions.EnableTapToNextControl="True" />
</Grid>
</Page>

16
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxMask/TextBoxMaskPage.xaml
Просмотреть файл

@ -1,23 +1,23 @@
<Page x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.TextBoxMaskPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<!-- Shallow Copy -->
<Grid Visibility="Collapsed">
<TextBox uwpui:TextBoxExtensions.Mask="9a9a--a9a*"/>
<TextBox ui:TextBoxExtensions.Mask="9a9a--a9a*"/>
<TextBox uwpui:TextBoxExtensions.Mask="+1999-9999"
uwpui:TextBoxExtensions.PlaceHolder=" " />
<TextBox ui:TextBoxExtensions.Mask="+1999-9999"
ui:TextBoxExtensions.PlaceHolder=" " />
<TextBox uwpui:TextBoxExtensions.Mask="+\964 799 999 9999"
uwpui:TextBoxExtensions.PlaceHolder=" " />
<TextBox ui:TextBoxExtensions.Mask="+\964 799 999 9999"
ui:TextBoxExtensions.PlaceHolder=" " />
<TextBox uwpui:TextBoxExtensions.CustomMask="5:[1-5],c:[a-c]"
uwpui:TextBoxExtensions.Mask="a5c-5c*9" />
<TextBox ui:TextBoxExtensions.CustomMask="5:[1-5],c:[a-c]"
ui:TextBoxExtensions.Mask="a5c-5c*9" />
</Grid>
</Page>

10
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/TextBoxRegex/TextBoxRegexPage.xaml
Просмотреть файл

@ -2,7 +2,7 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:common="using:Microsoft.Toolkit.Uwp.SampleApp.Common"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
@ -14,11 +14,11 @@
<Grid Visibility="Collapsed">
<TextBox uwpui:TextBoxExtensions.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"/>
<TextBlock Text="{Binding (uwpui:TextBoxExtensions.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
<TextBox ui:TextBoxExtensions.Regex="^\s*\+?\s*([0-9][\s-]*){9,}$"/>
<TextBlock Text="{Binding (ui:TextBoxExtensions.IsValid), ElementName=PhoneNumberValidator, Converter={StaticResource StringFormatConverter}}" />
<TextBox uwpui:TextBoxExtensions.ValidationMode="Normal"
uwpui:TextBoxExtensions.ValidationType="PhoneNumber" />
<TextBox ui:TextBoxExtensions.ValidationMode="Normal"
ui:TextBoxExtensions.ValidationType="PhoneNumber" />
</Grid>
</Page>

8
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ViewExtensions/ViewExtensionsPage.xaml
Просмотреть файл

@ -2,11 +2,11 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
uwpui:ApplicationViewExtensions.Title="View Extensions"
uwpui:TitleBarExtensions.BackgroundColor="Blue"
uwpui:TitleBarExtensions.ForegroundColor="White"
ui:ApplicationViewExtensions.Title="View Extensions"
ui:TitleBarExtensions.BackgroundColor="Blue"
ui:TitleBarExtensions.ForegroundColor="White"
mc:Ignorable="d">
<Grid />

14
Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Visual Extensions/VisualExtensionsPage.xaml
Просмотреть файл

@ -2,7 +2,7 @@
x:Class="Microsoft.Toolkit.Uwp.SampleApp.SamplePages.VisualExtensionsPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
@ -11,11 +11,11 @@
<Border Height="100"
Width="100"
Background="Purple"
uwpui:VisualExtensions.CenterPoint="50,50,0"
uwpui:VisualExtensions.Offset="50"
uwpui:VisualExtensions.Opacity="0.5"
uwpui:VisualExtensions.RotationAngleInDegrees="80"
uwpui:VisualExtensions.Scale="2, 0.5, 1"
uwpui:VisualExtensions.NormalizedCenterPoint="0.5"/>
ui:VisualExtensions.CenterPoint="50,50,0"
ui:VisualExtensions.Offset="50"
ui:VisualExtensions.Opacity="0.5"
ui:VisualExtensions.RotationAngleInDegrees="80"
ui:VisualExtensions.Scale="2, 0.5, 1"
ui:VisualExtensions.NormalizedCenterPoint="0.5"/>
</Grid>
</Page>

12
Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml
Просмотреть файл

@ -4,15 +4,15 @@
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
uwpui:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}"
uwpui:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}"
uwpui:TitleBarExtensions.ButtonForegroundColor="{StaticResource Titlebar-Foreground}"
uwpui:TitleBarExtensions.ForegroundColor="{StaticResource Titlebar-Foreground}"
ui:TitleBarExtensions.BackgroundColor="{StaticResource Brand-Color}"
ui:TitleBarExtensions.ButtonBackgroundColor="{StaticResource Brand-Color}"
ui:TitleBarExtensions.ButtonForegroundColor="{StaticResource Titlebar-Foreground}"
ui:TitleBarExtensions.ForegroundColor="{StaticResource Titlebar-Foreground}"
SizeChanged="Page_SizeChanged"
mc:Ignorable="d">
<Page.Resources>
@ -145,7 +145,7 @@
<Grid x:Name="MoreInfoContent"
Width="260"
Height="320"
uwpui:VisualExtensions.NormalizedCenterPoint="0.5">
ui:VisualExtensions.NormalizedCenterPoint="0.5">
<Grid VerticalAlignment="Top">
<controls:DropShadowPanel HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"

6
Microsoft.Toolkit.Uwp.SampleApp/Styles/Generic.xaml
Просмотреть файл

@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:toolkitControls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:winui="using:Microsoft.UI.Xaml.Controls">
<ResourceDictionary.MergedDictionaries>
@ -424,13 +424,13 @@
Background="Transparent">
<Grid Width="120"
Height="80"
uwpui:VisualExtensions.CenterPoint="40,60,0">
ui:VisualExtensions.CenterPoint="40,60,0">
<toolkitControls:DropShadowPanel HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"
BlurRadius="30"
ShadowOpacity="0.6"
OffsetY="3"
uwpui:VisualExtensions.Opacity="0"
ui:VisualExtensions.Opacity="0"
Visibility="Collapsed">
<Border></Border>
</toolkitControls:DropShadowPanel>

6
Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml
Просмотреть файл

@ -2,7 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters">
<SolidColorBrush x:Key="CheckerboardColor0">
@ -159,8 +159,8 @@
Tag="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color, Mode=OneWay}">
<GridView.ItemsPanel>
<ItemsPanelTemplate>
<controls:UniformGrid uwpui:FrameworkElementExtensions.AncestorType="controls:ColorPicker"
Columns="{Binding (uwpui:FrameworkElementExtensions.Ancestor).CustomPaletteColumnCount, RelativeSource={RelativeSource Self}}" />
<controls:UniformGrid ui:FrameworkElementExtensions.AncestorType="controls:ColorPicker"
Columns="{Binding (ui:FrameworkElementExtensions.Ancestor).CustomPaletteColumnCount, RelativeSource={RelativeSource Self}}" />
</ItemsPanelTemplate>
</GridView.ItemsPanel>
<GridView.ItemTemplate>

8
Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBox.xaml
Просмотреть файл

@ -1,7 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI">
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.Token.xaml"/>
<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls.Input/TokenizingTextBox/TokenizingTextBoxItem.AutoSuggestBox.xaml"/>
@ -51,9 +51,9 @@
<Setter Property="ItemsPanel">
<Setter.Value>
<ItemsPanelTemplate>
<controls:WrapPanel uwpui:FrameworkElementExtensions.AncestorType="controls:TokenizingTextBox"
HorizontalSpacing="{Binding (uwpui:FrameworkElementExtensions.Ancestor).TokenSpacing,RelativeSource={RelativeSource Self}}"
VerticalSpacing="{Binding (uwpui:FrameworkElementExtensions.Ancestor).TokenSpacing,RelativeSource={RelativeSource Self}}"
<controls:WrapPanel ui:FrameworkElementExtensions.AncestorType="controls:TokenizingTextBox"
HorizontalSpacing="{Binding (ui:FrameworkElementExtensions.Ancestor).TokenSpacing,RelativeSource={RelativeSource Self}}"
VerticalSpacing="{Binding (ui:FrameworkElementExtensions.Ancestor).TokenSpacing,RelativeSource={RelativeSource Self}}"
StretchChild="Last"/>
</ItemsPanelTemplate>
</Setter.Value>

18
Microsoft.Toolkit.Uwp.UI.Controls.Media/ImageCropper/ImageCropper.xaml
Просмотреть файл

@ -1,7 +1,7 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI">
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI">
<Style TargetType="controls:ImageCropper">
<Setter Property="IsTabStop" Value="False" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
@ -27,28 +27,28 @@
<Path x:Name="PART_MaskAreaPath"
Fill="{TemplateBinding Mask}" />
<controls:ImageCropperThumb x:Name="PART_TopThumb"
uwpui:FrameworkElementExtensions.Cursor="SizeNorthSouth"
ui:FrameworkElementExtensions.Cursor="SizeNorthSouth"
Style="{TemplateBinding SecondaryThumbStyle}" />
<controls:ImageCropperThumb x:Name="PART_BottomThumb"
uwpui:FrameworkElementExtensions.Cursor="SizeNorthSouth"
ui:FrameworkElementExtensions.Cursor="SizeNorthSouth"
Style="{TemplateBinding SecondaryThumbStyle}" />
<controls:ImageCropperThumb x:Name="PART_LeftThumb"
uwpui:FrameworkElementExtensions.Cursor="SizeWestEast"
ui:FrameworkElementExtensions.Cursor="SizeWestEast"
Style="{TemplateBinding SecondaryThumbStyle}" />
<controls:ImageCropperThumb x:Name="PART_RightThumb"
uwpui:FrameworkElementExtensions.Cursor="SizeWestEast"
ui:FrameworkElementExtensions.Cursor="SizeWestEast"
Style="{TemplateBinding SecondaryThumbStyle}" />
<controls:ImageCropperThumb x:Name="PART_UpperLeftThumb"
uwpui:FrameworkElementExtensions.Cursor="SizeNorthwestSoutheast"
ui:FrameworkElementExtensions.Cursor="SizeNorthwestSoutheast"
Style="{TemplateBinding PrimaryThumbStyle}" />
<controls:ImageCropperThumb x:Name="PART_UpperRightThumb"
uwpui:FrameworkElementExtensions.Cursor="SizeNortheastSouthwest"
ui:FrameworkElementExtensions.Cursor="SizeNortheastSouthwest"
Style="{TemplateBinding PrimaryThumbStyle}" />
<controls:ImageCropperThumb x:Name="PART_LowerLeftThumb"
uwpui:FrameworkElementExtensions.Cursor="SizeNortheastSouthwest"
ui:FrameworkElementExtensions.Cursor="SizeNortheastSouthwest"
Style="{TemplateBinding PrimaryThumbStyle}" />
<controls:ImageCropperThumb x:Name="PART_LowerRightThumb"
uwpui:FrameworkElementExtensions.Cursor="SizeNorthwestSoutheast"
ui:FrameworkElementExtensions.Cursor="SizeNorthwestSoutheast"
Style="{TemplateBinding PrimaryThumbStyle}" />
</Canvas>
</Grid>

8
UnitTests/UnitTests.UWP/Extensions/Test_BitmapIconExtensionMarkupExtension.cs
Просмотреть файл

@ -23,11 +23,11 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<Button x:Name=""RootButton"">
<Button.Flyout>
<MenuFlyout>
<MenuFlyoutItem Icon=""{uwpui:BitmapIcon Source=/Assets/StoreLogo.png}"" />
<MenuFlyoutItem Icon=""{ui:BitmapIcon Source=/Assets/StoreLogo.png}"" />
</MenuFlyout>
</Button.Flyout>
</Button>
@ -56,11 +56,11 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<Button x:Name=""RootButton"">
<Button.Flyout>
<MenuFlyout>
<MenuFlyoutItem Icon=""{uwpui:BitmapIcon Source=/Assets/StoreLogo.png, ShowAsMonochrome=True}"" />
<MenuFlyoutItem Icon=""{ui:BitmapIcon Source=/Assets/StoreLogo.png, ShowAsMonochrome=True}"" />
</MenuFlyout>
</Button.Flyout>
</Button>

4
UnitTests/UnitTests.UWP/Extensions/Test_EnumValuesExtension.cs
Просмотреть файл

@ -22,9 +22,9 @@ namespace UnitTests.Extensions
var treeRoot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:local=""using:UnitTests.Extensions"">
<ListView x:Name=""Check"" ItemsSource=""{uwpui:EnumValues Type=local:Animal}""/>
<ListView x:Name=""Check"" ItemsSource=""{ui:EnumValues Type=local:Animal}""/>
</Page>") as FrameworkElement;
var list = treeRoot.FindChild("Check") as ListView;

12
UnitTests/UnitTests.UWP/Extensions/Test_FontIconExtensionMarkupExtension.cs
Просмотреть файл

@ -22,8 +22,8 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
<AppBarButton x:Name=""Check"" Icon=""{uwpui:FontIcon Glyph=&#xE105;}""/>
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<AppBarButton x:Name=""Check"" Icon=""{ui:FontIcon Glyph=&#xE105;}""/>
</Page>") as FrameworkElement;
var button = treeroot.FindChild("Check") as AppBarButton;
@ -45,8 +45,8 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
<AppBarButton x:Name=""Check"" Icon=""{uwpui:FontIcon Glyph=&#xE14D;, FontFamily='Segoe UI'}""/>
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<AppBarButton x:Name=""Check"" Icon=""{ui:FontIcon Glyph=&#xE14D;, FontFamily='Segoe UI'}""/>
</Page>") as FrameworkElement;
var button = treeroot.FindChild("Check") as AppBarButton;
@ -68,8 +68,8 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
<AppBarButton x:Name=""Check"" Icon=""{uwpui:FontIcon Glyph=&#xE14D;, FontSize=7, FontFamily='Segoe MDL2 Assets', FontWeight=Bold, FontStyle=Italic, IsTextScaleFactorEnabled=True, MirroredWhenRightToLeft=True}""/>
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<AppBarButton x:Name=""Check"" Icon=""{ui:FontIcon Glyph=&#xE14D;, FontSize=7, FontFamily='Segoe MDL2 Assets', FontWeight=Bold, FontStyle=Italic, IsTextScaleFactorEnabled=True, MirroredWhenRightToLeft=True}""/>
</Page>") as FrameworkElement;
var button = treeroot.FindChild("Check") as AppBarButton;

12
UnitTests/UnitTests.UWP/Extensions/Test_FontIconSourceExtensionMarkupExtension.cs
Просмотреть файл

@ -23,9 +23,9 @@ namespace UnitTests.Extensions
var treeRoot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:controls=""using:UnitTests.Extensions"">
<controls:MockSwipeItem x:Name=""Check"" IconSource=""{uwpui:FontIconSource Glyph=&#xE105;}""/>
<controls:MockSwipeItem x:Name=""Check"" IconSource=""{ui:FontIconSource Glyph=&#xE105;}""/>
</Page>") as FrameworkElement;
var button = treeRoot.FindChild("Check") as MockSwipeItem;
@ -47,9 +47,9 @@ namespace UnitTests.Extensions
var treeRoot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:controls=""using:UnitTests.Extensions"">
<controls:MockSwipeItem x:Name=""Check"" IconSource=""{uwpui:FontIconSource Glyph=&#xE14D;, FontFamily='Segoe UI'}""/>
<controls:MockSwipeItem x:Name=""Check"" IconSource=""{ui:FontIconSource Glyph=&#xE14D;, FontFamily='Segoe UI'}""/>
</Page>") as FrameworkElement;
var button = treeRoot.FindChild("Check") as MockSwipeItem;
@ -71,9 +71,9 @@ namespace UnitTests.Extensions
var treeRoot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:controls=""using:UnitTests.Extensions"">
<controls:MockSwipeItem x:Name=""Check"" IconSource=""{uwpui:FontIconSource Glyph=&#xE14D;, FontSize=7, FontFamily='Segoe MDL2 Assets', FontWeight=Bold, FontStyle=Italic, IsTextScaleFactorEnabled=True, MirroredWhenRightToLeft=True}""/>
<controls:MockSwipeItem x:Name=""Check"" IconSource=""{ui:FontIconSource Glyph=&#xE14D;, FontSize=7, FontFamily='Segoe MDL2 Assets', FontWeight=Bold, FontStyle=Italic, IsTextScaleFactorEnabled=True, MirroredWhenRightToLeft=True}""/>
</Page>") as FrameworkElement;
var button = treeRoot.FindChild("Check") as MockSwipeItem;

24
UnitTests/UnitTests.UWP/Extensions/Test_NullableBoolMarkupExtension.cs
Просмотреть файл

@ -22,8 +22,8 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{uwpui:NullableBool Value=True}""/>
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{ui:NullableBool Value=True}""/>
</Page>") as FrameworkElement;
var toggle = treeroot.FindChild("Check") as CheckBox;
@ -40,8 +40,8 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{uwpui:NullableBool Value=False}""/>
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{ui:NullableBool Value=False}""/>
</Page>") as FrameworkElement;
var toggle = treeroot.FindChild("Check") as CheckBox;
@ -58,8 +58,8 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{uwpui:NullableBool IsNull=True}""/>
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{ui:NullableBool IsNull=True}""/>
</Page>") as FrameworkElement;
var toggle = treeroot.FindChild("Check") as CheckBox;
@ -76,8 +76,8 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{uwpui:NullableBool IsNull=True, Value=True}""/>
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{ui:NullableBool IsNull=True, Value=True}""/>
</Page>") as FrameworkElement;
var toggle = treeroot.FindChild("Check") as CheckBox;
@ -95,8 +95,8 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{uwpui:NullableBool IsNull=True, Value=False}""/>
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI"">
<CheckBox x:Name=""Check"" IsChecked=""{ui:NullableBool IsNull=True, Value=False}""/>
</Page>") as FrameworkElement;
var toggle = treeroot.FindChild("Check") as CheckBox;
@ -207,10 +207,10 @@ namespace UnitTests.Extensions
var treeroot = XamlReader.Load(@"<Page
xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
xmlns:uwpui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:ui=""using:Microsoft.Toolkit.Uwp.UI""
xmlns:helpers=""using:UnitTests.Extensions.Helpers"">
<Page.Resources>
<helpers:ObjectWithNullableBoolProperty x:Key=""OurObject"" NullableBool=""{uwpui:NullableBool Value=True}""/>
<helpers:ObjectWithNullableBoolProperty x:Key=""OurObject"" NullableBool=""{ui:NullableBool Value=True}""/>
</Page.Resources>
</Page>") as FrameworkElement;

18
UnitTests/UnitTests.UWP/UnitTestApp.xaml
Просмотреть файл

@ -2,41 +2,41 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:uwpui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
xmlns:helpers="using:UnitTests.Extensions.Helpers"
xmlns:unitTestExtensions="using:UnitTests.Extensions"
RequestedTheme="Light">
<Application.Resources>
<!-- Workarounds for .NET Native issue in unit tests -->
<uwpui:EnumValuesExtension x:Key="DummyExtension"/>
<ui:EnumValuesExtension x:Key="DummyExtension"/>
<unitTestExtensions:Animal x:Key="Animal">Cat</unitTestExtensions:Animal>
<CommandBar x:Key="DummyCommandBar">
<AppBarButton Icon="{uwpui:FontIcon Glyph=&#xE102;}" />
<AppBarButton Icon="{uwpui:SymbolIcon Symbol=Play}" />
<AppBarButton Icon="{ui:FontIcon Glyph=&#xE102;}" />
<AppBarButton Icon="{ui:SymbolIcon Symbol=Play}" />
</CommandBar>
<unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl1"
IconSource="{uwpui:FontIconSource Glyph=&#xE10B;}" />
IconSource="{ui:FontIconSource Glyph=&#xE10B;}" />
<unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl2"
IconSource="{uwpui:SymbolIconSource Symbol=Play}" />
IconSource="{ui:SymbolIconSource Symbol=Play}" />
<unitTestExtensions:MockSwipeItem x:Key="DummySwipeControl3"
IconSource="{uwpui:BitmapIconSource Source=/Assets/StoreLogo.png}" />
IconSource="{ui:BitmapIconSource Source=/Assets/StoreLogo.png}" />
<Button x:Key="DummyButton">
<Button.Flyout>
<MenuFlyout>
<MenuFlyoutItem Icon="{uwpui:BitmapIcon Source=/Assets/StoreLogo.png}" />
<MenuFlyoutItem Icon="{ui:BitmapIcon Source=/Assets/StoreLogo.png}" />
</MenuFlyout>
</Button.Flyout>
</Button>
<Style TargetType="controls:UniformGrid" />
<uwpui:NullableBoolExtension x:Key="nullableBool" />
<ui:NullableBoolExtension x:Key="nullableBool" />
<helpers:ObjectWithNullableBoolProperty x:Key="objectWithNullableBoolProperty" />