From a432f7d5b15b2f5ee5e2d22d1c55eac826407f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Wed, 12 Oct 2022 10:12:53 +0200 Subject: [PATCH 1/2] Add SupportedOSPlatform browser --- samples/ControlCatalog.Web/Program.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/samples/ControlCatalog.Web/Program.cs b/samples/ControlCatalog.Web/Program.cs index 52acabb0fa..7d05c8e462 100644 --- a/samples/ControlCatalog.Web/Program.cs +++ b/samples/ControlCatalog.Web/Program.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) From 97c0b1304892401ec9291b6c7bf675b0c2d3dd0e Mon Sep 17 00:00:00 2001 From: Emmanuel Hansen Date: Wed, 12 Oct 2022 13:56:07 +0000 Subject: [PATCH 2/2] fix android crash when ime is dismissed on a read only input --- .../Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs index f8eaeba897..8e47d30bcb 100644 --- a/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs +++ b/src/Android/Avalonia.Android/Platform/SkiaPlatform/TopLevelImpl.cs @@ -301,7 +301,7 @@ namespace Avalonia.Android.Platform.SkiaPlatform IsComposing = true; - _inputMethod.Client.SetPreeditText(ComposingText); + _inputMethod.Client?.SetPreeditText(ComposingText); return base.SetComposingText(text, newCursorPosition); }