Browse Source
Merge branch 'master' into textInputMethodClientRework
pull/11848/head
Benedikt Stebner
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
5 deletions
-
packages/Avalonia/Avalonia.csproj
-
src/Avalonia.Controls/TextBox.cs
|
|
@ -5,7 +5,7 @@ |
|
|
</PropertyGroup> |
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
<ItemGroup> |
|
|
<ItemGroup> |
|
|
<PackageReference Include="Avalonia.BuildServices" Version="0.0.22" /> |
|
|
<PackageReference Include="Avalonia.BuildServices" Version="0.0.27" /> |
|
|
<ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" /> |
|
|
<ProjectReference Include="../../src/Avalonia.Remote.Protocol/Avalonia.Remote.Protocol.csproj" /> |
|
|
<ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj"> |
|
|
<ProjectReference Include="../../src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj"> |
|
|
<PrivateAssets>all</PrivateAssets> |
|
|
<PrivateAssets>all</PrivateAssets> |
|
|
|
|
|
@ -812,14 +812,14 @@ namespace Avalonia.Controls |
|
|
{ |
|
|
{ |
|
|
base.OnAttachedToVisualTree(e); |
|
|
base.OnAttachedToVisualTree(e); |
|
|
|
|
|
|
|
|
if (IsFocused) |
|
|
if (_presenter != null) |
|
|
{ |
|
|
{ |
|
|
if(_presenter != null) |
|
|
if (IsFocused) |
|
|
{ |
|
|
{ |
|
|
_presenter.ShowCaret(); |
|
|
_presenter.ShowCaret(); |
|
|
|
|
|
|
|
|
_presenter.PropertyChanged += PresenterPropertyChanged; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
_presenter.PropertyChanged += PresenterPropertyChanged; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
