Browse Source
Merge branch 'master' into fix/selected-psuedo-class-getting-cleared
pull/1648/head
danwalmsley
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
src/Avalonia.Visuals/Media/FontFamily.cs
|
|
|
@ -77,10 +77,10 @@ namespace Avalonia.Media |
|
|
|
/// <summary>
|
|
|
|
/// Implicit conversion of string to FontFamily
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="fontFamily"></param>
|
|
|
|
public static implicit operator FontFamily(string fontFamily) |
|
|
|
/// <param name="s"></param>
|
|
|
|
public static implicit operator FontFamily(string s) |
|
|
|
{ |
|
|
|
return new FontFamily(fontFamily); |
|
|
|
return Parse(s); |
|
|
|
} |
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|