Skip to content

Commit 8ba9ed4

Browse files
azchohfiazchohfi
committed
Merge branch 'main' into winui
# Conflicts: # CommunityToolkit.WinUI.UI.Controls.Core.Design/CommunityToolkit.WinUI.UI.Controls.Core.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/Loading.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/Menu.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Icons/CommunityToolkit.WinUI.UI.Controls.Menu.icon.png # CommunityToolkit.WinUI.UI.Controls.Core.Design/Icons/CommunityToolkit.WinUI.UI.Controls.RotatorTile.icon.png # CommunityToolkit.WinUI.UI.Controls.Core.Design/Icons/Menu.icon.png # CommunityToolkit.WinUI.UI.Controls.Core.Design/Icons/RotatorTile.icon.png # CommunityToolkit.WinUI.UI.Controls.Core.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.DataGrid.Design/CommunityToolkit.WinUI.UI.Controls.DataGrid.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.DataGrid/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Input.Design/CommunityToolkit.WinUI.UI.Controls.Input.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Input.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/CommunityToolkit.WinUI.UI.Controls.Layout.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Markdown.Design/CommunityToolkit.WinUI.UI.Controls.Markdown.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Media.Design/CommunityToolkit.WinUI.UI.Controls.Media.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Media.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Primitives.Design/CommunityToolkit.WinUI.UI.Controls.Primitives.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png # build/Windows.Toolkit.VisualStudio.Design.props
2 parents a77adc9 + 683a0e7 commit 8ba9ed4

File tree

68 files changed

+87
-942
lines changed

Some content is hidden

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

68 files changed

+87
-942
lines changed

‎CommunityToolkit.WinUI.UI.Animations/Xaml/Abstract/Animation{TValue,TKeyFrame}.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ protected INormalizedKeyFrameAnimationBuilder<TKeyFrame> AppendToBuilder(INormal
142142

143143
if (from is not null)
144144
{
145-
builder.KeyFrame(0.0, from.Value, default, default);
145+
builder.KeyFrame(0.0, from.Value);
146146
}
147147

148148
return builder;

‎CommunityToolkit.WinUI.UI.Animations/Xaml/Abstract/ImplicitAnimation{TValue,TKeyFrame}.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public CompositionAnimation GetAnimation(UIElement element, out string? target)
7474

7575
if (from is not null)
7676
{
77-
builder.KeyFrame(0.0, from.Value, default, default);
77+
builder.KeyFrame(0.0, from.Value, DefaultEasingType, DefaultEasingMode);
7878
}
7979

8080
foreach (var keyFrame in KeyFrames)

‎CommunityToolkit.WinUI.UI.Controls.Core.Design/CommunityToolkit.WinUI.UI.Controls.Core.DesignTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net472</TargetFramework>
5-
<RootNamespace>CommunityToolkit.WinUI.UI.Controls</RootNamespace>
5+
<RootNamespace>CommunityToolkit.WinUI.UI.Controls.Design</RootNamespace>
66
</PropertyGroup>
77

88
<PropertyGroup>

‎CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using CommunityToolkit.WinUI.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
119
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;

‎CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using CommunityToolkit.WinUI.UI.Controls.Design.Properties;
87
using Microsoft.VisualStudio.DesignTools.Extensibility;
98
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
109

‎CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using CommunityToolkit.WinUI.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119

‎CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/Loading.Metadata.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using CommunityToolkit.WinUI.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119

‎CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/Menu.Metadata.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using CommunityToolkit.WinUI.UI.Controls.Design.Properties;
8-
97
using Microsoft.VisualStudio.DesignTools.Extensibility;
108
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
119
using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;

‎CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
using System.ComponentModel;
66

7-
using CommunityToolkit.WinUI.UI.Controls.Design.Properties;
87
using Microsoft.VisualStudio.DesignTools.Extensibility;
98
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
109
using Microsoft.VisualStudio.DesignTools.Extensibility.PropertyEditing;

‎CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/RadialProgressBar.Metadata.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.ComponentModel;
6+
67
using Microsoft.VisualStudio.DesignTools.Extensibility;
78
using Microsoft.VisualStudio.DesignTools.Extensibility.Features;
89
using Microsoft.VisualStudio.DesignTools.Extensibility.Metadata;
@@ -27,8 +28,8 @@ public RadialProgressBarMetadata()
2728
b =>
2829
{
2930
b.AddCustomAttributes(new FeatureAttribute(typeof(RadialProgressBarDefaults)));
30-
b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Properties.Resources.CategoryAppearance));
31-
b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Properties.Resources.CategoryBrush));
31+
b.AddCustomAttributes(nameof(RadialProgressBar.Thickness), new CategoryAttribute(Resources.CategoryAppearance));
32+
b.AddCustomAttributes(nameof(RadialProgressBar.Outline), new CategoryAttribute(Resources.CategoryBrush));
3233
b.AddCustomAttributes(new ToolboxCategoryAttribute(ToolboxCategoryPaths.Toolkit, false));
3334
}
3435
);

0 commit comments

Comments
 (0)