Browse Source
Merge branch 'master' into feature/optional-clear-in-rendertargetbitmap-createdrawingcontext
pull/12793/head
Paisley Mahern
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
8 additions and
3 deletions
-
.github/PULL_REQUEST_TEMPLATE.md
-
src/Avalonia.X11/NativeDialogs/Gtk.cs
-
src/Avalonia.X11/X11Window.cs
-
src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
|
|
|
@ -18,7 +18,7 @@ |
|
|
|
|
|
|
|
- [ ] Added unit tests (if possible)? |
|
|
|
- [ ] Added XML documentation to any related classes? |
|
|
|
- [ ] Consider submitting a PR to https://github.com/AvaloniaUI/Documentation with user documentation |
|
|
|
- [ ] Consider submitting a PR to https://github.com/AvaloniaUI/avalonia-docs with user documentation |
|
|
|
|
|
|
|
## Breaking changes |
|
|
|
<!--- List any breaking changes here. --> |
|
|
|
|
|
|
|
@ -256,9 +256,13 @@ namespace Avalonia.X11.NativeDialogs |
|
|
|
|
|
|
|
public static IntPtr GetForeignWindow(IntPtr xid) => gdk_x11_window_foreign_new_for_display(s_display, xid); |
|
|
|
|
|
|
|
static object s_startGtkLock = new(); |
|
|
|
static Task<bool> s_startGtkTask; |
|
|
|
|
|
|
|
public static Task<bool> StartGtk() |
|
|
|
{ |
|
|
|
return StartGtkCore(); |
|
|
|
lock (s_startGtkLock) |
|
|
|
return s_startGtkTask ??= StartGtkCore(); |
|
|
|
} |
|
|
|
|
|
|
|
private static void GtkThread(TaskCompletionSource<bool> tcs) |
|
|
|
|
|
|
|
@ -648,6 +648,7 @@ namespace Avalonia.X11 |
|
|
|
SendNetWMMessage(_x11.Atoms._NET_ACTIVE_WINDOW, (IntPtr)1, _x11.LastActivityTimestamp, |
|
|
|
IntPtr.Zero); |
|
|
|
} |
|
|
|
WindowStateChanged?.Invoke(value); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -1 +1 @@ |
|
|
|
Subproject commit c5d5d8b78dce42dfb7b7f320a5c345da36a58579 |
|
|
|
Subproject commit 3d57397eed3f111e1fa20446de4ef5f9310ebe71 |