From f8eb57adf1b5fd8ec13cbbcc35450dba289a0723 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Wed, 1 Jul 2026 15:20:02 +0500
Subject: [PATCH] Fixed XEmbed client (#21677)

---
 samples/XEmbedSample/Program.cs                           | 1 +
 samples/XEmbedSample/XEmbedSample.csproj                  | 2 ++
 src/Avalonia.X11/X11WindowModes/XEmbedClientWindowMode.cs | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

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<App>()
             .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 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj"/>
+    <ProjectReference Include="../../src/HarfBuzz/Avalonia.HarfBuzz/Avalonia.HarfBuzz.csproj"/>
+
     <ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj"/>
   </ItemGroup>
 
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;