Merge branch 'main' into shweaver/storage-helpers
This commit is contained in:
Shane Weaver
GitHub
Коммит
f3080d0de4
|
|
@ -111,7 +111,7 @@
|
|||
</PackageReference>
|
||||
-->
|
||||
<PackageReference Include="Microsoft.UI.Xaml">
|
||||
<Version>2.5.0</Version>
|
||||
<Version>2.6.1</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Monaco.Editor">
|
||||
<Version>0.7.0-alpha</Version>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@
|
|||
ImageSource="ms-appx:///SamplePages/TileControl/Animations.png"
|
||||
ParallaxSpeedRatio="@[Parallax Speed Ratio:DoubleSlider:1.2:1-3]"
|
||||
ScrollViewerContainer="{Binding ElementName=FlipView, Mode=OneTime}">
|
||||
<FlipView x:Name="FlipView">
|
||||
<FlipView x:Name="FlipView" Background="Transparent">
|
||||
|
||||
<Border Style="{StaticResource BorderStyle}">
|
||||
<TextBlock Style="{StaticResource TextBlockStyle}" Text="Parallax with FlipView >"/>
|
||||
|
|
|
|||
|
|
@ -34,6 +34,9 @@
|
|||
MenuItemTemplate="{StaticResource CategoryTemplate}"
|
||||
PaneDisplayMode="Top"
|
||||
SelectionFollowsFocus="Disabled">
|
||||
<winui:NavigationView.Resources>
|
||||
<CornerRadius x:Key="NavigationViewContentGridCornerRadius">0,0,0,0</CornerRadius>
|
||||
</winui:NavigationView.Resources>
|
||||
<winui:NavigationView.AutoSuggestBox>
|
||||
<AutoSuggestBox x:Name="SearchBox"
|
||||
MinWidth="150"
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
<Setter Property="Visibility" Value="Visible" />
|
||||
<Setter Property="Background" Value="Transparent" />
|
||||
<Setter Property="BorderThickness" Value="0" />
|
||||
<Setter Property="Padding" Value="8,5,8,6" />
|
||||
</Style>
|
||||
|
||||
<Style x:Key="TokenizingTextBoxItemTokenStyle" TargetType="controls:TokenizingTextBoxItem">
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@
|
|||
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
|
||||
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
|
||||
<Setter Property="TitleBarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
|
||||
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundAltHighBrush}" />
|
||||
<Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
|
||||
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
|
||||
<Setter Property="TabNavigation" Value="Local" />
|
||||
<Setter Property="IsHoldingEnabled" Value="True" />
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<Setter Property="Margin" Value="0" />
|
||||
<Setter Property="MinWidth" Value="{ThemeResource GridViewItemMinWidth}" />
|
||||
<Setter Property="MinHeight" Value="{ThemeResource GridViewItemMinHeight}" />
|
||||
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundChromeHighBrush}" />
|
||||
<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
|
||||
<Setter Property="BorderThickness" Value="1" />
|
||||
<Setter Property="IsTabStop" Value="False" />
|
||||
<Setter Property="IsExpanded" Value="True"/>
|
||||
|
|
@ -156,8 +156,7 @@
|
|||
Background="{TemplateBinding CloseButtonBackground}"
|
||||
Style="{StaticResource ButtonRevealStyle}"
|
||||
BorderThickness="1"
|
||||
Width="32"
|
||||
Height="32"
|
||||
VerticalAlignment="Stretch"
|
||||
Content=""
|
||||
FontFamily="Segoe MDL2 Assets"
|
||||
FontSize="14"
|
||||
|
|
@ -169,8 +168,7 @@
|
|||
Background="{TemplateBinding CloseButtonBackground}"
|
||||
Style="{StaticResource ButtonRevealStyle}"
|
||||
BorderThickness="1"
|
||||
Width="32"
|
||||
Height="32"
|
||||
VerticalAlignment="Stretch"
|
||||
Content=""
|
||||
FontFamily="Segoe MDL2 Assets"
|
||||
FontSize="14"
|
||||
|
|
|
|||
|
|
@ -11,9 +11,8 @@
|
|||
|
||||
<Style x:Key="HeaderToggleButtonStyle"
|
||||
TargetType="ToggleButton">
|
||||
<Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
|
||||
<Setter Property="Foreground" Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
|
||||
<Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundTransparentBrush}" />
|
||||
<Setter Property="Background" Value="{ThemeResource ExpanderHeaderBackground}" />
|
||||
<Setter Property="BorderBrush" Value="{ThemeResource ExpanderHeaderBorderBrush}" />
|
||||
<Setter Property="BorderThickness" Value="0" />
|
||||
<Setter Property="Padding" Value="2,0,0,0" />
|
||||
<Setter Property="Height" Value="40" />
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@
|
|||
<!-- Only the Layout package have a dependency on WinUI -->
|
||||
<ItemGroup Condition="$(CurrentProject) == 'UWPBaselineWinUI' or $(CurrentProject) == 'Microsoft.Toolkit.Uwp.UI.Controls.Layout'">
|
||||
<PackageReference Include="Microsoft.UI.Xaml">
|
||||
<Version>2.5.0</Version>
|
||||
<Version>2.6.1</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI' and '$(NuGetPackageVersion)' != 'To Fill In With Local Version Number'">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
Microsoft.NET.CoreFramework.Debug.2.2.appx
|
||||
Microsoft.NET.CoreRuntime.2.2.appx
|
||||
Microsoft.UI.Xaml.2.5.appx
|
||||
Microsoft.UI.Xaml.2.6.appx
|
||||
Microsoft.VCLibs.x86.Debug.14.00.appx
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Microsoft.NET.Native.Framework.2.2.appx
|
||||
Microsoft.NET.Native.Runtime.2.2.appx
|
||||
Microsoft.UI.Xaml.2.5.appx
|
||||
Microsoft.UI.Xaml.2.6.appx
|
||||
Microsoft.VCLibs.x86.14.00.appx
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.UI.Xaml" Version="2.5.0" />
|
||||
<PackageReference Include="Microsoft.UI.Xaml" Version="2.6.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче