diff --git a/samples/XEmbedSample/Program.cs b/samples/XEmbedSample/Program.cs index b8f00bd86d..81035dcf9d 100644 --- a/samples/XEmbedSample/Program.cs +++ b/samples/XEmbedSample/Program.cs @@ -17,6 +17,7 @@ class Program HarfbuzzWorkaround.Apply(); AppBuilder.Configure() .UseSkia() + .UseHarfBuzz() .With(new X11PlatformOptions() { UseGLibMainLoop = true, diff --git a/samples/XEmbedSample/XEmbedSample.csproj b/samples/XEmbedSample/XEmbedSample.csproj index 1b51999ada..46388eea83 100644 --- a/samples/XEmbedSample/XEmbedSample.csproj +++ b/samples/XEmbedSample/XEmbedSample.csproj @@ -13,6 +13,8 @@ + + diff --git a/src/Avalonia.X11/X11WindowModes/XEmbedClientWindowMode.cs b/src/Avalonia.X11/X11WindowModes/XEmbedClientWindowMode.cs index 824a26d10f..73b967a780 100644 --- a/src/Avalonia.X11/X11WindowModes/XEmbedClientWindowMode.cs +++ b/src/Avalonia.X11/X11WindowModes/XEmbedClientWindowMode.cs @@ -9,7 +9,7 @@ partial class X11Window { public class XEmbedClientWindowMode : X11WindowMode { - EmbeddableControlRoot? Root => Window._inputRoot?.RootElement as EmbeddableControlRoot; + EmbeddableControlRoot? Root => Window._inputRoot?.FocusRoot as EmbeddableControlRoot; private bool _focusedInEmbedder; private bool _embedderActivated; private bool _disabled;