AvaloniaUI
/
AvaloniaEdit
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge branch 'master' into fix-mem-leak

This commit is contained in:
Daniel Peñalba 2023-11-23 12:08:09 +01:00 коммит произвёл GitHub
Родитель 228bb5e4f0 a5031a4370
Коммит 7848baeea1
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
9 изменённых файлов: 52 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
.gitignore поставляемый
Просмотреть файл

@ -254,3 +254,4 @@ paket-files/
# Visual Studio Code
.vscode/
.DS_Store

28
Directory.Build.props
Просмотреть файл

@ -2,8 +2,32 @@
<PropertyGroup>
<LangVersion>latest</LangVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AvaloniaVersion>11.0.4</AvaloniaVersion>
<TextMateSharpVersion>1.0.55</TextMateSharpVersion>
<AvaloniaVersion>11.0.0</AvaloniaVersion>
<AvaloniaSampleVersion>11.0.5</AvaloniaSampleVersion>
<TextMateSharpVersion>1.0.56</TextMateSharpVersion>
<VersionSuffix>beta</VersionSuffix>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<IncludeSymbols>true</IncludeSymbols>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<Version>11.0.5</Version>
<Authors>Avalonia Team</Authors>
<Copyright>Copyright 2017-$([System.DateTime]::Now.ToString(`yyyy`)) &#169; The AvaloniaUI Project</Copyright>
<RepositoryUrl>https://github.com/AvaloniaUI/AvaloniaEdit/</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>Icon.png</PackageIcon>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
<ItemGroup Label="PackageIcon">
<None Include="$(MSBuildThisFileDirectory)/Icon.png" Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
</ItemGroup>
</Project>

Двоичные данные
Icon.png Normal file
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 14 KiB

6
src/AvaloniaEdit.Demo/AvaloniaEdit.Demo.csproj
Просмотреть файл

@ -31,9 +31,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Avalonia" Version="$(AvaloniaSampleVersion)" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaSampleVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaSampleVersion)"/>
<ProjectReference Include="..\AvaloniaEdit\AvaloniaEdit.csproj" />
<ProjectReference Include="..\AvaloniaEdit.TextMate\AvaloniaEdit.TextMate.csproj" />
</ItemGroup>

5
src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj
Просмотреть файл

@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<Description>TextMate integration for AvaloniaEdit.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageDescription>TextMate integration for AvaloniaEdit.</PackageDescription>
</PropertyGroup>
<ItemGroup>

8
src/AvaloniaEdit/AvaloniaEdit.csproj
Просмотреть файл

@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<WarningsNotAsErrors>0612,0618</WarningsNotAsErrors>
<PackageId>Avalonia.AvaloniaEdit</PackageId>
<Description>This project is a port of AvalonEdit, a WPF-based text editor for Avalonia.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageDescription>This project is a port of AvalonEdit, a WPF-based text editor for Avalonia.</PackageDescription>
<PackageTags>editor;code-editor;avalonia;text-editor;netstandard</PackageTags>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>
@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.6.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
</ItemGroup>
<ItemGroup>

12
src/AvaloniaEdit/Snippets/SnippetReplaceableTextElement.cs
Просмотреть файл

@ -202,7 +202,11 @@ namespace AvaloniaEdit.Snippets
if (Layer == KnownLayer.Background)
{
geoBuilder.AddSegment(textView, s);
drawingContext.DrawGeometry(BackgroundBrush, null, geoBuilder.CreateGeometry());
var geometry = geoBuilder.CreateGeometry();
if(geometry != null)
{
drawingContext.DrawGeometry(BackgroundBrush, null, geometry);
}
}
else
{
@ -218,7 +222,11 @@ namespace AvaloniaEdit.Snippets
geoBuilder.CloseFigure();
}
}
drawingContext.DrawGeometry(null, ActiveBorderPen, geoBuilder.CreateGeometry());
var geometry = geoBuilder.CreateGeometry();
if(geometry != null)
{
drawingContext.DrawGeometry(null, ActiveBorderPen, geometry);
}
}
}
}

4
src/AvaloniaEdit/Themes/Simple/AvaloniaEdit.xaml
Просмотреть файл

@ -15,7 +15,7 @@
<StaticResource x:Key="OverloadViewerBorderBrush" ResourceKey="ThemeBorderMidBrush" />
<SolidColorBrush x:Key="SearchPanelBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}" />
<SolidColorBrush x:Key="SearchPanelBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
<SolidColorBrush x:Key="TextAreaSelectionBrush" Color="{DynamicResource HighlightBrush}" />
<SolidColorBrush x:Key="TextAreaSelectionBrush" Color="{DynamicResource HighlightColor}" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="CompletionToolTipBackground" ResourceKey="ThemeBackgroundBrush" />
@ -27,7 +27,7 @@
<StaticResource x:Key="OverloadViewerBorderBrush" ResourceKey="ThemeBorderMidBrush" />
<SolidColorBrush x:Key="SearchPanelBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}" />
<SolidColorBrush x:Key="SearchPanelBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
<SolidColorBrush x:Key="TextAreaSelectionBrush" Color="{DynamicResource HighlightBrush}" />
<SolidColorBrush x:Key="TextAreaSelectionBrush" Color="{DynamicResource HighlightColor}" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>

8
test/AvaloniaEdit.Tests/AvaloniaEdit.Tests.csproj
Просмотреть файл

@ -5,10 +5,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Headless.NUnit" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia" Version="$(AvaloniaSampleVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaSampleVersion)" />
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaSampleVersion)" />
<PackageReference Include="Avalonia.Headless.NUnit" Version="$(AvaloniaSampleVersion)" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="3.13.2" />