Browse Source
Merge branch 'master' into update-inter
pull/9168/head
Dan Walmsley
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
1 deletions
-
samples/ControlCatalog.Web/Program.cs
-
src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs
|
|
|
@ -1,8 +1,11 @@ |
|
|
|
using System.Runtime.Versioning; |
|
|
|
using Avalonia; |
|
|
|
using Avalonia.Web; |
|
|
|
using ControlCatalog; |
|
|
|
using ControlCatalog.Web; |
|
|
|
|
|
|
|
[assembly:SupportedOSPlatform("browser")] |
|
|
|
|
|
|
|
internal partial class Program |
|
|
|
{ |
|
|
|
private static void Main(string[] args) |
|
|
|
|
|
|
|
@ -301,7 +301,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform |
|
|
|
|
|
|
|
IsComposing = true; |
|
|
|
|
|
|
|
_inputMethod.Client.SetPreeditText(ComposingText); |
|
|
|
_inputMethod.Client?.SetPreeditText(ComposingText); |
|
|
|
|
|
|
|
return base.SetComposingText(text, newCursorPosition); |
|
|
|
} |
|
|
|
|
