Browse Source

Merge branch 'master' into feature/optional-clear-in-rendertargetbitmap-createdrawingcontext

pull/12793/head
Paisley Mahern 3 years ago
committed by GitHub
parent
commit
758cf620ce
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/PULL_REQUEST_TEMPLATE.md
  2. 6
      src/Avalonia.X11/NativeDialogs/Gtk.cs
  3. 1
      src/Avalonia.X11/X11Window.cs
  4. 2
      src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github

2
.github/PULL_REQUEST_TEMPLATE.md

@ -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. -->

6
src/Avalonia.X11/NativeDialogs/Gtk.cs

@ -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)

1
src/Avalonia.X11/X11Window.cs

@ -648,6 +648,7 @@ namespace Avalonia.X11
SendNetWMMessage(_x11.Atoms._NET_ACTIVE_WINDOW, (IntPtr)1, _x11.LastActivityTimestamp,
IntPtr.Zero);
}
WindowStateChanged?.Invoke(value);
}
}

2
src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github

@ -1 +1 @@
Subproject commit c5d5d8b78dce42dfb7b7f320a5c345da36a58579
Subproject commit 3d57397eed3f111e1fa20446de4ef5f9310ebe71
Loading…
Cancel
Save