holger/ModernWpfPlayground
1
0
Fork 0
mirror of https://github.com/holgerb83/ModernWpfPlayground.git synced 2025-06-30 01:40:51 +02:00
Code Issues 1 Projects 1 Releases Wiki Activity

fixed csproj dependencies

Browse Source
This commit is contained in:
Holger Börchers
2021-01-01 22:38:09 +01:00
parent ff3ec4d9e6
commit 90b24e547d
8 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Controls/Controls.csproj
View File

@ -1,16 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
<TargetFramework>net5.0-windows</TargetFramework>
<UseWPF>true</UseWPF>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.1.0" />
<PackageReference Include="ModernWpfUI" Version="0.9.3-preview.201204.0" />
<PackageReference Include="System.Drawing.Common" Version="5.0.0" />
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2005" />
</ItemGroup>
</Project>

8
Controls/PropertyPresenter/EnumToKeyValueListConverter.cs
View File

@ -26,10 +26,12 @@ namespace Controls
/// <returns></returns>
private static string GetDescription(object value)
{
if (!(value is Enum enumValue)) return string.Empty;
if (value is not Enum enumValue) return string.Empty;
var descriptionAttribute = enumValue.GetType()
.GetField(enumValue.ToString())?.GetCustomAttributes(false)
.OfType<DescriptionAttribute>().FirstOrDefault();
.GetField(enumValue.ToString())?
.GetCustomAttributes(false)
.OfType<DescriptionAttribute>()
.FirstOrDefault();
return descriptionAttribute?.Description ?? value.ToString() ?? string.Empty;
}

6
Controls/PropertyPresenter/MagicSymbolConverter.cs
View File

@ -36,11 +36,11 @@ namespace Controls
var data = value as string;
if (string.IsNullOrWhiteSpace(data)) return value; //maybe not a string. eventually something else.
if (data.StartsWith(NoParseKeyword, StringComparison.Ordinal)) return data.Substring(NoParseKeyword.Length);
if (data.StartsWith(NoParseKeyword, StringComparison.Ordinal)) return data[NoParseKeyword.Length..];
if (data.StartsWith(PathKeyword, StringComparison.Ordinal))
{
var path = data.Substring(PathKeyword.Length);
var path = data[PathKeyword.Length..];
var icon = ObjectImageConverter.GetIcon(Geometry.Parse(path), Brushes.Black);
return new Image
{
@ -53,7 +53,7 @@ namespace Controls
if (data.StartsWith(DynResKeyword, StringComparison.Ordinal))
{
var resourceKey = data.Substring(DynResKeyword.Length);
var resourceKey = data[DynResKeyword.Length..];
//get icon from resource dictionary
return new Image
{

2
Controls/PropertyPresenter/ValueConverter.cs
View File

@ -26,7 +26,7 @@ namespace Controls
return System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(bitmap.GetHbitmap(), IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromWidthAndHeight(16, 16));
}
if (!(value is string strValue)) return Binding.DoNothing;
if (value is not string strValue) return Binding.DoNothing;
if (strValue.StartsWith(dynResPrefix, StringComparison.Ordinal))
{
var resource = Application.Current.TryFindResource(strValue.Replace(dynResPrefix, string.Empty , StringComparison.InvariantCulture));