Merge branch 'master' into fix-mem-leak
This commit is contained in:
Коммит
7848baeea1
|
@ -254,3 +254,4 @@ paket-files/
|
||||||
|
|
||||||
# Visual Studio Code
|
# Visual Studio Code
|
||||||
.vscode/
|
.vscode/
|
||||||
|
.DS_Store
|
||||||
|
|
|
@ -2,8 +2,32 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||||
<AvaloniaVersion>11.0.4</AvaloniaVersion>
|
<AvaloniaVersion>11.0.0</AvaloniaVersion>
|
||||||
<TextMateSharpVersion>1.0.55</TextMateSharpVersion>
|
<AvaloniaSampleVersion>11.0.5</AvaloniaSampleVersion>
|
||||||
|
<TextMateSharpVersion>1.0.56</TextMateSharpVersion>
|
||||||
<VersionSuffix>beta</VersionSuffix>
|
<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`)) © The AvaloniaUI Project</Copyright>
|
||||||
|
<RepositoryUrl>https://github.com/AvaloniaUI/AvaloniaEdit/</RepositoryUrl>
|
||||||
|
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
||||||
|
<PackageIcon>Icon.png</PackageIcon>
|
||||||
|
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
|
||||||
</PropertyGroup>
|
</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>
|
</Project>
|
||||||
|
|
Двоичный файл не отображается.
После Ширина: | Высота: | Размер: 14 KiB |
|
@ -31,9 +31,9 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia" Version="$(AvaloniaSampleVersion)" />
|
||||||
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaSampleVersion)" />
|
||||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)"/>
|
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaSampleVersion)"/>
|
||||||
<ProjectReference Include="..\AvaloniaEdit\AvaloniaEdit.csproj" />
|
<ProjectReference Include="..\AvaloniaEdit\AvaloniaEdit.csproj" />
|
||||||
<ProjectReference Include="..\AvaloniaEdit.TextMate\AvaloniaEdit.TextMate.csproj" />
|
<ProjectReference Include="..\AvaloniaEdit.TextMate\AvaloniaEdit.TextMate.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.0</TargetFramework>
|
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
|
||||||
<LangVersion>latest</LangVersion>
|
<LangVersion>latest</LangVersion>
|
||||||
<Description>TextMate integration for AvaloniaEdit.</Description>
|
<PackageDescription>TextMate integration for AvaloniaEdit.</PackageDescription>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netstandard2.0</TargetFramework>
|
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
|
||||||
<WarningsNotAsErrors>0612,0618</WarningsNotAsErrors>
|
<WarningsNotAsErrors>0612,0618</WarningsNotAsErrors>
|
||||||
<PackageId>Avalonia.AvaloniaEdit</PackageId>
|
<PackageId>Avalonia.AvaloniaEdit</PackageId>
|
||||||
<Description>This project is a port of AvalonEdit, a WPF-based text editor for Avalonia.</Description>
|
<PackageDescription>This project is a port of AvalonEdit, a WPF-based text editor for Avalonia.</PackageDescription>
|
||||||
<PackageLicenseExpression>MIT</PackageLicenseExpression>
|
<PackageTags>editor;code-editor;avalonia;text-editor;netstandard</PackageTags>
|
||||||
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
|
<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>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
@ -202,7 +202,11 @@ namespace AvaloniaEdit.Snippets
|
||||||
if (Layer == KnownLayer.Background)
|
if (Layer == KnownLayer.Background)
|
||||||
{
|
{
|
||||||
geoBuilder.AddSegment(textView, s);
|
geoBuilder.AddSegment(textView, s);
|
||||||
drawingContext.DrawGeometry(BackgroundBrush, null, geoBuilder.CreateGeometry());
|
var geometry = geoBuilder.CreateGeometry();
|
||||||
|
if(geometry != null)
|
||||||
|
{
|
||||||
|
drawingContext.DrawGeometry(BackgroundBrush, null, geometry);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -218,7 +222,11 @@ namespace AvaloniaEdit.Snippets
|
||||||
geoBuilder.CloseFigure();
|
geoBuilder.CloseFigure();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
drawingContext.DrawGeometry(null, ActiveBorderPen, geoBuilder.CreateGeometry());
|
var geometry = geoBuilder.CreateGeometry();
|
||||||
|
if(geometry != null)
|
||||||
|
{
|
||||||
|
drawingContext.DrawGeometry(null, ActiveBorderPen, geometry);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
<StaticResource x:Key="OverloadViewerBorderBrush" ResourceKey="ThemeBorderMidBrush" />
|
<StaticResource x:Key="OverloadViewerBorderBrush" ResourceKey="ThemeBorderMidBrush" />
|
||||||
<SolidColorBrush x:Key="SearchPanelBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}" />
|
<SolidColorBrush x:Key="SearchPanelBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}" />
|
||||||
<SolidColorBrush x:Key="SearchPanelBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
|
<SolidColorBrush x:Key="SearchPanelBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
|
||||||
<SolidColorBrush x:Key="TextAreaSelectionBrush" Color="{DynamicResource HighlightBrush}" />
|
<SolidColorBrush x:Key="TextAreaSelectionBrush" Color="{DynamicResource HighlightColor}" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
<ResourceDictionary x:Key="Dark">
|
<ResourceDictionary x:Key="Dark">
|
||||||
<StaticResource x:Key="CompletionToolTipBackground" ResourceKey="ThemeBackgroundBrush" />
|
<StaticResource x:Key="CompletionToolTipBackground" ResourceKey="ThemeBackgroundBrush" />
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
<StaticResource x:Key="OverloadViewerBorderBrush" ResourceKey="ThemeBorderMidBrush" />
|
<StaticResource x:Key="OverloadViewerBorderBrush" ResourceKey="ThemeBorderMidBrush" />
|
||||||
<SolidColorBrush x:Key="SearchPanelBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}" />
|
<SolidColorBrush x:Key="SearchPanelBackgroundBrush" Color="{DynamicResource ThemeBackgroundColor}" />
|
||||||
<SolidColorBrush x:Key="SearchPanelBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
|
<SolidColorBrush x:Key="SearchPanelBorderBrush" Color="{DynamicResource ThemeBorderLowColor}" />
|
||||||
<SolidColorBrush x:Key="TextAreaSelectionBrush" Color="{DynamicResource HighlightBrush}" />
|
<SolidColorBrush x:Key="TextAreaSelectionBrush" Color="{DynamicResource HighlightColor}" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</ResourceDictionary.ThemeDictionaries>
|
</ResourceDictionary.ThemeDictionaries>
|
||||||
|
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia" Version="$(AvaloniaSampleVersion)" />
|
||||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaSampleVersion)" />
|
||||||
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaSampleVersion)" />
|
||||||
<PackageReference Include="Avalonia.Headless.NUnit" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia.Headless.NUnit" Version="$(AvaloniaSampleVersion)" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
|
||||||
<PackageReference Include="Moq" Version="4.18.4" />
|
<PackageReference Include="Moq" Version="4.18.4" />
|
||||||
<PackageReference Include="NUnit" Version="3.13.2" />
|
<PackageReference Include="NUnit" Version="3.13.2" />
|
||||||
|
|
Загрузка…
Ссылка в новой задаче