Browse Source
Merge pull request #1330 from AvaloniaUI/fixes/809-skia-formatted-text
Fixes/809 skia formatted text
pull/1321/merge
Jeremy Koritzinsky
9 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
7 additions and
3 deletions
-
scripts/ReplaceNugetCache.ps1
-
scripts/ReplaceNugetCache.sh
-
scripts/ReplaceNugetCacheRelease.ps1
-
src/Skia/Avalonia.Skia/FormattedTextImpl.cs
|
|
|
@ -2,3 +2,4 @@ copy ..\samples\ControlCatalog.NetCore\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard2.0\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Debug\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.skia\$args\lib\netstandard2.0\ |
|
|
|
|
|
|
|
@ -3,4 +3,6 @@ |
|
|
|
cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netcoreapp2.0/ |
|
|
|
cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia/$1/lib/netstandard2.0/ |
|
|
|
cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.gtk3/$1/lib/netstandard2.0/ |
|
|
|
cp ../samples/ControlCatalog.NetCore/bin/Debug/netcoreapp2.0/Avalonia**.dll ~/.nuget/packages/avalonia.skia/$1/lib/netstandard2.0/ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1,4 +1,5 @@ |
|
|
|
copy ..\samples\ControlCatalog.NetCore\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netcoreapp2.0\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia\$args\lib\netstandard2.0\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.gtk3\$args\lib\netstandard2.0\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.win32\$args\lib\netstandard2.0\ |
|
|
|
copy ..\samples\ControlCatalog.NetCore.\bin\Release\netcoreapp2.0\Avalonia**.dll ~\.nuget\packages\avalonia.skia\$args\lib\netstandard2.0\ |
|
|
|
@ -450,7 +450,7 @@ namespace Avalonia.Skia |
|
|
|
{ |
|
|
|
var match = _foregroundBrushes[bi]; |
|
|
|
|
|
|
|
len = match.Key.EndIndex - index + 1; |
|
|
|
len = match.Key.EndIndex - index; |
|
|
|
result = match.Value; |
|
|
|
|
|
|
|
if (len > 0 && len < length) |
|
|
|
@ -641,7 +641,7 @@ namespace Avalonia.Skia |
|
|
|
Length = length; |
|
|
|
} |
|
|
|
|
|
|
|
public int EndIndex => StartIndex + Length - 1; |
|
|
|
public int EndIndex => StartIndex + Length; |
|
|
|
|
|
|
|
public int Length { get; private set; } |
|
|
|
|
|
|
|
|
