Browse Source

Fixed XEmbed client (#21677)

pull/21688/head
Nikita Tsukanov 3 months ago
committed by GitHub
parent
commit
f8eb57adf1
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      samples/XEmbedSample/Program.cs
  2. 2
      samples/XEmbedSample/XEmbedSample.csproj
  3. 2
      src/Avalonia.X11/X11WindowModes/XEmbedClientWindowMode.cs

1
samples/XEmbedSample/Program.cs

@ -17,6 +17,7 @@ class Program
HarfbuzzWorkaround.Apply();
AppBuilder.Configure<App>()
.UseSkia()
.UseHarfBuzz()
.With(new X11PlatformOptions()
{
UseGLibMainLoop = true,

2
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>

2
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;

Loading…
Cancel
Save