Nikita Tsukanov
3 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
4 additions and
1 deletions
-
samples/XEmbedSample/Program.cs
-
samples/XEmbedSample/XEmbedSample.csproj
-
src/Avalonia.X11/X11WindowModes/XEmbedClientWindowMode.cs
|
|
@ -17,6 +17,7 @@ class Program |
|
|
HarfbuzzWorkaround.Apply(); |
|
|
HarfbuzzWorkaround.Apply(); |
|
|
AppBuilder.Configure<App>() |
|
|
AppBuilder.Configure<App>() |
|
|
.UseSkia() |
|
|
.UseSkia() |
|
|
|
|
|
.UseHarfBuzz() |
|
|
.With(new X11PlatformOptions() |
|
|
.With(new X11PlatformOptions() |
|
|
{ |
|
|
{ |
|
|
UseGLibMainLoop = true, |
|
|
UseGLibMainLoop = true, |
|
|
|
|
|
@ -13,6 +13,8 @@ |
|
|
|
|
|
|
|
|
<ItemGroup> |
|
|
<ItemGroup> |
|
|
<ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj"/> |
|
|
<ProjectReference Include="..\..\src\Avalonia.X11\Avalonia.X11.csproj"/> |
|
|
|
|
|
<ProjectReference Include="../../src/HarfBuzz/Avalonia.HarfBuzz/Avalonia.HarfBuzz.csproj"/> |
|
|
|
|
|
|
|
|
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj"/> |
|
|
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj"/> |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -9,7 +9,7 @@ partial class X11Window |
|
|
{ |
|
|
{ |
|
|
public class XEmbedClientWindowMode : X11WindowMode |
|
|
public class XEmbedClientWindowMode : X11WindowMode |
|
|
{ |
|
|
{ |
|
|
EmbeddableControlRoot? Root => Window._inputRoot?.RootElement as EmbeddableControlRoot; |
|
|
EmbeddableControlRoot? Root => Window._inputRoot?.FocusRoot as EmbeddableControlRoot; |
|
|
private bool _focusedInEmbedder; |
|
|
private bool _focusedInEmbedder; |
|
|
private bool _embedderActivated; |
|
|
private bool _embedderActivated; |
|
|
private bool _disabled; |
|
|
private bool _disabled; |
|
|
|
