Skip to content

Commit cd3b7ad

Browse files
codendonecodendone
committed
Merge branch 'winui3/release/1.8-stable'
2 parents 113bee9 + 61382c0 commit cd3b7ad

178 files changed

Lines changed: 23650 additions & 1842 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Packages.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
3030
<PackageReference Update="CommunityToolkit.WinUI.Controls.SettingsControls" Version="$(CommunityToolkitWinUIVersion)" />
3131
<PackageReference Update="CommunityToolkit.WinUI.Converters" Version="$(CommunityToolkitWinUIVersion)" />
3232
<PackageReference Update="CommunityToolkit.WinUI.Animations" Version="$(CommunityToolkitWinUIVersion)" />
33+
<PackageReference Update="CommunityToolkit.WinUI.Controls.Primitives" Version="$(CommunityToolkitWinUIVersion)" />
3334
<PackageReference Update="Microsoft.Graphics.Win2D" Version="$(GraphicsWin2DVersion)" />
3435
<PackageReference Update="Win2d.uwp" Version="$(Win2DUWPVersion)" />
35-
<PackageReference Update="Win2d.winui" Version="$(Win2DWinUIVersion)" />
36+
<PackageReference Update="Microsoft.Graphics.Win2D" Version="$(Win2DWinUIVersion)" />
3637
<PackageReference Update="DiffPlex" Version="1.2.1" />
3738
<PackageReference Update="System.Private.Uri" Version="4.3.2"/>
3839
<PackageReference Update="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)"/>

‎src/controls/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
</VisualState>
8989
</VisualStateGroup>
9090
</VisualStateManager.VisualStateGroups>
91-
<TextBlock x:Name="GlyphElement" Foreground="{ThemeResource TextControlButtonForeground}" VerticalAlignment="Center" HorizontalAlignment="Center" FontStyle="Normal" FontSize="{ThemeResource AutoSuggestBoxIconFontSize}" Text="&#xE894;" FontFamily="{ThemeResource SymbolThemeFontFamily}" AutomationProperties.AccessibilityView="Raw" />
91+
<TextBlock x:Name="GlyphElement" Foreground="{ThemeResource TextControlButtonForeground}" VerticalAlignment="Center" HorizontalAlignment="Center" FontStyle="Normal" FontSize="{ThemeResource AutoSuggestBoxIconFontSize}" Text="&#xE894;" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTextScaleFactorEnabled="False" AutomationProperties.AccessibilityView="Raw" />
9292
</Grid>
9393
</ControlTemplate>
9494
</Setter.Value>

‎src/controls/dev/CommandBarFlyout/Strings/de-DE/Resources.resw‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<value>Ausgewählten Text fett formatieren</value>
138138
</data>
139139
<data name="TextCommandDescriptionCopy" xml:space="preserve">
140-
<value>Ausgewählten Inhalt in die Zwischenablage kopieren</value>
140+
<value>Ausgewählten Inhalt in Zwischenablage</value>
141141
</data>
142142
<data name="TextCommandDescriptionCut" xml:space="preserve">
143143
<value>Ausgewählten Inhalt entfernen und in der Zwischenablage ablegen</value>

‎src/controls/dev/CommonStyles/Button_themeresources.xaml‎

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,18 @@
1414
<StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="AccentControlElevationBorderBrush" />
1515
<StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="ControlFillColorTransparentBrush" />
1616
<StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="ControlFillColorTransparentBrush" />
17+
<StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
18+
<StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
19+
<StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
20+
<StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
21+
<StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
22+
<StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
23+
<StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
24+
<StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
25+
<StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
26+
<StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
27+
<StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
28+
<StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
1729
<Thickness x:Key="ButtonBorderThemeThickness">1</Thickness>
1830
<StaticResource x:Key="ButtonBackground" ResourceKey="ControlFillColorDefaultBrush" />
1931
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
@@ -51,6 +63,18 @@
5163
<StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlHighlightBaseMediumLowBrush" />
5264
<StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
5365
<StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
66+
<StaticResource x:Key="SubtleButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
67+
<StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
68+
<StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SystemColorHighlightTextColorBrush" />
69+
<StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
70+
<StaticResource x:Key="SubtleButtonForeground" ResourceKey="SystemColorButtonTextColorBrush" />
71+
<StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="SystemControlHighlightBaseHighBrush" />
72+
<StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="SystemControlHighlightBaseHighBrush" />
73+
<StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
74+
<StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
75+
<StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SystemColorHighlightColorBrush" />
76+
<StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SystemColorHighlightTextColorBrush" />
77+
<StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
5478
<StaticResource x:Key="ButtonBackground" ResourceKey="SystemControlBackgroundBaseLowBrush" />
5579
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="SystemColorHighlightTextColorBrush" />
5680
<StaticResource x:Key="ButtonBackgroundPressed" ResourceKey="SystemColorHighlightTextColorBrush" />
@@ -88,6 +112,18 @@
88112
<StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="AccentControlElevationBorderBrush" />
89113
<StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="ControlFillColorTransparentBrush" />
90114
<StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="ControlFillColorTransparentBrush" />
115+
<StaticResource x:Key="SubtleButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
116+
<StaticResource x:Key="SubtleButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
117+
<StaticResource x:Key="SubtleButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
118+
<StaticResource x:Key="SubtleButtonBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
119+
<StaticResource x:Key="SubtleButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
120+
<StaticResource x:Key="SubtleButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
121+
<StaticResource x:Key="SubtleButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
122+
<StaticResource x:Key="SubtleButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
123+
<StaticResource x:Key="SubtleButtonBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
124+
<StaticResource x:Key="SubtleButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
125+
<StaticResource x:Key="SubtleButtonBorderBrushPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
126+
<StaticResource x:Key="SubtleButtonBorderBrushDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
91127
<Thickness x:Key="ButtonBorderThemeThickness">1</Thickness>
92128
<StaticResource x:Key="ButtonBackground" ResourceKey="ControlFillColorDefaultBrush" />
93129
<StaticResource x:Key="ButtonBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
@@ -258,4 +294,85 @@
258294
</Setter.Value>
259295
</Setter>
260296
</Style>
297+
<Style x:Key="SubtleButtonStyle" TargetType="Button">
298+
<Setter Property="Background" Value="{ThemeResource SubtleButtonBackground}" />
299+
<Setter Property="BackgroundSizing" Value="InnerBorderEdge" />
300+
<Setter Property="Foreground" Value="{ThemeResource SubtleButtonForeground}" />
301+
<Setter Property="BorderBrush" Value="{ThemeResource SubtleButtonBorderBrush}" />
302+
<Setter Property="BorderThickness" Value="{ThemeResource ButtonBorderThemeThickness}" />
303+
<Setter Property="Padding" Value="{StaticResource ButtonPadding}" />
304+
<Setter Property="HorizontalAlignment" Value="Left" />
305+
<Setter Property="VerticalAlignment" Value="Center" />
306+
<Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}" />
307+
<Setter Property="FontWeight" Value="Normal" />
308+
<Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}" />
309+
<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
310+
<Setter Property="FocusVisualMargin" Value="-3" />
311+
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
312+
<Setter Property="Template">
313+
<Setter.Value>
314+
<ControlTemplate TargetType="Button">
315+
<ContentPresenter x:Name="ContentPresenter" Background="{TemplateBinding Background}" Foreground="{TemplateBinding Foreground}" BackgroundSizing="{TemplateBinding BackgroundSizing}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTransitions="{TemplateBinding ContentTransitions}" CornerRadius="{TemplateBinding CornerRadius}" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.AccessibilityView="Raw" local:AnimatedIcon.State="Normal" xmlns:local="using:Microsoft.UI.Xaml.Controls">
316+
<ContentPresenter.BackgroundTransition>
317+
<BrushTransition Duration="0:0:0.083" />
318+
</ContentPresenter.BackgroundTransition>
319+
<VisualStateManager.VisualStateGroups>
320+
<VisualStateGroup x:Name="CommonStates">
321+
<VisualState x:Name="Normal" />
322+
<VisualState x:Name="PointerOver">
323+
<Storyboard>
324+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
325+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPointerOver}" />
326+
</ObjectAnimationUsingKeyFrames>
327+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
328+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPointerOver}" />
329+
</ObjectAnimationUsingKeyFrames>
330+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
331+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPointerOver}" />
332+
</ObjectAnimationUsingKeyFrames>
333+
</Storyboard>
334+
<VisualState.Setters>
335+
<Setter Target="ContentPresenter.(controls:AnimatedIcon.State)" Value="PointerOver" />
336+
</VisualState.Setters>
337+
</VisualState>
338+
<VisualState x:Name="Pressed">
339+
<Storyboard>
340+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
341+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundPressed}" />
342+
</ObjectAnimationUsingKeyFrames>
343+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
344+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushPressed}" />
345+
</ObjectAnimationUsingKeyFrames>
346+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
347+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundPressed}" />
348+
</ObjectAnimationUsingKeyFrames>
349+
</Storyboard>
350+
<VisualState.Setters>
351+
<Setter Target="ContentPresenter.(controls:AnimatedIcon.State)" Value="Pressed" />
352+
</VisualState.Setters>
353+
</VisualState>
354+
<VisualState x:Name="Disabled">
355+
<Storyboard>
356+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
357+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBackgroundDisabled}" />
358+
</ObjectAnimationUsingKeyFrames>
359+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
360+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonBorderBrushDisabled}" />
361+
</ObjectAnimationUsingKeyFrames>
362+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
363+
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource SubtleButtonForegroundDisabled}" />
364+
</ObjectAnimationUsingKeyFrames>
365+
</Storyboard>
366+
<VisualState.Setters>
367+
<!-- DisabledVisual Should be handled by the control, not the animated icon. -->
368+
<Setter Target="ContentPresenter.(controls:AnimatedIcon.State)" Value="Normal" />
369+
</VisualState.Setters>
370+
</VisualState>
371+
</VisualStateGroup>
372+
</VisualStateManager.VisualStateGroups>
373+
</ContentPresenter>
374+
</ControlTemplate>
375+
</Setter.Value>
376+
</Setter>
377+
</Style>
261378
</ResourceDictionary>

0 commit comments

Comments
 (0)