Skip to content

Commit 3eb667c

Browse files
punker76punker76
authored
Merge pull request #4485 from batzen/develop
Adding BackDrop
2 parents f7ba305 + 02479e0 commit 3eb667c

File tree

79 files changed

+2170
-2464
lines changed

Some content is hidden

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

79 files changed

+2170
-2464
lines changed

‎appveyor.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ branches:
66
- main
77

88
environment:
9+
# bad, but without this, gitversion doesn't work anymore
10+
IGNORE_NORMALISATION_GIT_HEAD_MOVE: 1
911
azure-key-vault-url:
1012
secure: 1mKS/HfCVq+iYNRVSrrN8NEowOkKt3knrpMzw+SOy3g=
1113
azure-key-vault-client-id:
@@ -30,15 +32,15 @@ install:
3032
git checkout -qf $($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT)
3133
}
3234
- ps: Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile 'dotnet-install.ps1'
33-
- ps: ./dotnet-install.ps1 -Version 8.0.100 -InstallDir "C:\Program Files\dotnet"
35+
- ps: ./dotnet-install.ps1 -Version 8.0.403 -InstallDir "C:\Program Files\dotnet"
3436

3537
pull_requests:
3638
do_not_increment_build_number: false
3739

3840
build_script:
3941
- ps: dotnet --info
4042
- ps: gitversion /version
41-
- ps: .\build.ps1 --target=ci #--verbosity=diagnostic
43+
- ps: .\build.ps1 --target=ci --verbosity=diagnostic
4244

4345
after_build:
4446
- ps: gci -Filter *.trx -Path .\TestResults\ | % { (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_.FullName)) }

‎build.cake

+2-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
#tool dotnet:?package=NuGetKeyVaultSignTool&version=3.2.3
66
#tool dotnet:?package=AzureSignTool&version=4.0.1
77
#tool dotnet:?package=GitReleaseManager.Tool&version=0.15.0
8-
#tool dotnet:?package=XamlStyler.Console&version=3.2206.4
9-
8+
#tool dotnet:?package=XamlStyler.Console&version=3.2404.2
109
#tool nuget:?package=GitVersion.CommandLine&version=5.12.0
11-
#tool nuget:?package=xunit.runner.console&version=2.5.2
10+
#tool nuget:?package=NUnit.ConsoleRunner&version=3.18.3
1211

1312
#addin nuget:?package=Cake.Figlet&version=2.0.1
1413

‎src/Directory.Build.Props

+8-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,14 @@
6767

6868
<!-- Add the references for all projects and targets -->
6969
<ItemGroup>
70-
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" IncludeAssets="build;compile" />
71-
<PackageReference Include="WpfAnalyzers" PrivateAssets="all" IncludeAssets="build;analyzers" />
70+
<PackageReference Include="JetBrains.Annotations">
71+
<PrivateAssets>all</PrivateAssets>
72+
<IncludeAssets>compile; build</IncludeAssets>
73+
</PackageReference>
74+
<PackageReference Include="WpfAnalyzers">
75+
<PrivateAssets>all</PrivateAssets>
76+
<IncludeAssets>build;analyzers</IncludeAssets>
77+
</PackageReference>
7278
</ItemGroup>
7379

7480
<ItemGroup>

‎src/Directory.packages.props

+16-15
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,33 @@
44
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup Label="Build">
7-
<PackageVersion Include="ControlzEx" Version="7.0.0-alpha0021" />
7+
<PackageVersion Include="ControlzEx" version="7.0.0-rc0118" />
88
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
99
<PackageVersion Include="XAMLTools.MSBuild" Version="1.0.0-alpha0167" />
10-
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
10+
<PackageVersion Include="JetBrains.Annotations" Version="2024.2.0" />
1111
<PackageVersion Include="Caliburn.Micro" Version="4.0.212" />
12-
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="4.11.0" />
13-
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />
14-
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="4.11.0" />
15-
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="4.11.0" />
16-
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="4.11.0" />
12+
<PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="5.0.0" />
13+
<PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="5.0.0" />
14+
<PackageVersion Include="MahApps.Metro.IconPacks.Material" Version="5.0.0" />
15+
<PackageVersion Include="MahApps.Metro.IconPacks.Modern" Version="5.0.0" />
16+
<PackageVersion Include="MahApps.Metro.IconPacks.Octicons" Version="5.0.0" />
1717
<PackageVersion Include="MaterialDesignThemes" Version="3.0.1" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
1818
<PackageVersion Include="MaterialDesignColors" Version="1.2.7" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == false " />
1919
<PackageVersion Include="MaterialDesignThemes" Version="4.9.0" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
2020
<PackageVersion Include="MaterialDesignColors" Version="2.1.4" Condition=" $(DefineConstants.Contains(NETCOREAPP)) == true " />
2121
<PackageVersion Include="NHotkey.Wpf" Version="3.0.0" />
22-
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2277.86" />
23-
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta" />
22+
<PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
23+
<PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.3.106" />
2424
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
25-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
25+
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
26+
<PackageVersion Include="System.Memory" Version="4.5.5" />
27+
<PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" Condition="'$(TargetFramework)' != 'net8.0-windows'" />
2628
<PackageVersion Include="WpfAnalyzers" Version="4.1.1" />
2729
</ItemGroup>
2830
<ItemGroup Label="Test">
29-
<PackageVersion Include="xunit" Version="2.7.0" />
30-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
31-
<PackageVersion Include="xunit.runner.console" Version="2.7.0" />
32-
<PackageVersion Include="xunit.analyzers" Version="1.11.0" />
33-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
31+
<PackageVersion Include="NUnit" Version="4.2.2" />
32+
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
33+
<PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
34+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
3435
</ItemGroup>
3536
</Project>

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/App.xaml.cs

+21
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.Windows;
6+
using ControlzEx.Theming;
67

78
namespace MetroDemo
89
{
@@ -11,5 +12,25 @@ namespace MetroDemo
1112
/// </summary>
1213
public partial class App : Application
1314
{
15+
/// <inheritdoc />
16+
protected override void OnStartup(StartupEventArgs e)
17+
{
18+
base.OnStartup(e);
19+
20+
ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncAll;
21+
22+
ThemeManager.Current.SyncTheme();
23+
24+
ThemeManager.Current.ThemeChanged += CurrentOnThemeChanged;
25+
26+
#pragma warning disable CS0618 // Type or member is obsolete
27+
AppModeHelper.SyncAppMode();
28+
29+
void CurrentOnThemeChanged(object? sender, ThemeChangedEventArgs themeChangedEventArgs)
30+
{
31+
AppModeHelper.SyncAppMode();
32+
}
33+
#pragma warning restore CS0618 // Type or member is obsolete
34+
}
1435
}
1536
}

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/ButtonsExample.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@
329329

330330
<mah:ToggleSwitch Margin="{StaticResource ControlMargin}"
331331
Header="Header"
332-
Toggled="ToggleSwitch_OnToggled"
333-
IsOn="{Binding CanUseToggleSwitch, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
332+
IsOn="{Binding CanUseToggleSwitch, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
333+
Toggled="ToggleSwitch_OnToggled" />
334334
<mah:ToggleSwitch Margin="{StaticResource ControlMargin}"
335335
CommandParameter="{Binding}"
336336
OffCommand="{Binding ToggleSwitchOffCommand}"

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DateExamples.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
88
xmlns:local="clr-namespace:MetroDemo"
99
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
10+
xmlns:markup="clr-namespace:MetroDemo.Markup"
1011
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1112
xmlns:system="clr-namespace:System;assembly=mscorlib"
12-
xmlns:markup="clr-namespace:MetroDemo.Markup"
1313
d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
1414
d:DesignHeight="600"
1515
d:DesignWidth="800"

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/SplitViewExamples.xaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,11 @@
124124
FontSize="20"
125125
Foreground="Black"
126126
Text="{Binding ElementName=sliderTest, Path=Value, Mode=OneWay, FallbackValue=0}" />
127-
<Slider x:Name="sliderTest" Margin="10" Minimum="0" Maximum="100" Value="42" />
127+
<Slider x:Name="sliderTest"
128+
Margin="10"
129+
Maximum="100"
130+
Minimum="0"
131+
Value="42" />
128132
</StackPanel>
129133
</Grid>
130134

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/TextExamples.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -376,9 +376,9 @@
376376
</mah:MetroHeader>
377377

378378
<mah:MetroHeader Header="Min">
379-
<mah:NumericUpDown AutomationProperties.AutomationId="AutomationIdTested"
380-
Margin="{StaticResource ControlMargin}"
379+
<mah:NumericUpDown Margin="{StaticResource ControlMargin}"
381380
mah:TextBoxHelper.ClearTextButton="True"
381+
AutomationProperties.AutomationId="AutomationIdTested"
382382
Maximum="{Binding ElementName=NUD, Path=Maximum, Mode=OneWay}"
383383
Value="{Binding ElementName=NUD, Path=Minimum, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
384384
</mah:MetroHeader>

‎src/MahApps.Metro.Samples/MahApps.Metro.Demo/MainWindow.xaml

+20
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,14 @@
114114
<x:Type TypeName="controlzEx:WindowCornerPreference" />
115115
</ObjectDataProvider.MethodParameters>
116116
</ObjectDataProvider>
117+
118+
<ObjectDataProvider x:Key="WindowBackdropTypeEnumValues"
119+
MethodName="GetValues"
120+
ObjectType="{x:Type controlzEx:WindowBackdropType}">
121+
<ObjectDataProvider.MethodParameters>
122+
<x:Type TypeName="controlzEx:WindowBackdropType" />
123+
</ObjectDataProvider.MethodParameters>
124+
</ObjectDataProvider>
117125
</ResourceDictionary>
118126
</Window.Resources>
119127

@@ -238,6 +246,18 @@
238246
</ControlTemplate>
239247
</MenuItem.Template>
240248
</MenuItem>
249+
<MenuItem>
250+
<MenuItem.Template>
251+
<ControlTemplate>
252+
<StackPanel Orientation="Horizontal">
253+
<Label Content="Backdrop" />
254+
<ComboBox VerticalAlignment="Center"
255+
ItemsSource="{Binding Source={StaticResource WindowBackdropTypeEnumValues}}"
256+
SelectedItem="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type mah:MetroWindow}}, Path=(controlzEx:WindowBackdropManager.BackdropType), Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
257+
</StackPanel>
258+
</ControlTemplate>
259+
</MenuItem.Template>
260+
</MenuItem>
241261
</MenuItem>
242262
<MenuItem Header="Glow">
243263
<MenuItem Header="PreferDWMBorderColor"

‎src/MahApps.Metro.sln

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.28711.60
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.11.35312.102
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MahApps.Metro", "MahApps.Metro\MahApps.Metro.csproj", "{F6432F90-04C2-42B9-992B-CD828729976B}"
77
EndProject
@@ -14,6 +14,7 @@ EndProject
1414
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EC5373FC-2098-4D7B-8990-B15E9C631AE8}"
1515
ProjectSection(SolutionItems) = preProject
1616
..\.editorconfig = ..\.editorconfig
17+
..\build.cake = ..\build.cake
1718
Directory.Build.props = Directory.Build.props
1819
Directory.Build.targets = Directory.Build.targets
1920
Directory.packages.props = Directory.packages.props

‎src/MahApps.Metro.sln.DotSettings

+5
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,10 @@ See the LICENSE file in the project root for more information.&#xD;
709709
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="PART_" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
710710
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
711711
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
712+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=236f7aa5_002D7b06_002D43ca_002Dbf2a_002D9b31bfcff09a/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="CONSTANT_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="PART_" Suffix="" Style="AaBb"&gt;&lt;ExtraRule Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;&lt;/Policy&gt;</s:String>
713+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
712714
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=d042ea60_002Decd9_002D4779_002Db28d_002De9203ebec0ba/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Public" Description="Test methods"&gt;&lt;ElementKinds&gt;&lt;Kind Name="TEST_TYPE" /&gt;&lt;Kind Name="TEST_MEMBER" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb_AaBb" /&gt;&lt;/Policy&gt;</s:String>
715+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;&lt;/Policy&gt;</s:String>
713716
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
714717
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
715718
<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
@@ -796,11 +799,13 @@ See the LICENSE file in the project root for more information.&#xD;
796799
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
797800
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
798801
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
802+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
799803
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
800804
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
801805
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
802806
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
803807
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
808+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean>
804809
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
805810
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
806811
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>

‎src/MahApps.Metro/Controls/Icons/PathIcon.cs

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
using System.ComponentModel;
56
using System.Windows;
67
using System.Windows.Media;
78
using System.Windows.Shapes;
@@ -23,6 +24,7 @@ public static readonly DependencyProperty DataProperty
2324
/// <summary>
2425
/// Gets or sets a Geometry that specifies the shape to be drawn. In XAML this can also be set using the Path Markup Syntax.
2526
/// </summary>
27+
[TypeConverter(typeof(GeometryConverter))]
2628
public Geometry? Data
2729
{
2830
get => (Geometry?)this.GetValue(DataProperty);

0 commit comments

Comments
 (0)