Browse Source
Merge branch 'master' into issues/grid
pull/3157/head
Dariusz Komosiński
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
0 deletions
-
src/Avalonia.Controls/DesktopApplicationExtensions.cs
-
src/Avalonia.Controls/Primitives/PopupRoot.cs
|
|
|
@ -50,6 +50,7 @@ namespace Avalonia.Controls |
|
|
|
/// On desktop-style platforms runs the application's main loop with custom CancellationToken
|
|
|
|
/// without setting a lifetime.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="app">The application.</param>
|
|
|
|
/// <param name="token">The token to track.</param>
|
|
|
|
public static void Run(this Application app, CancellationToken token) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -41,6 +41,8 @@ namespace Avalonia.Controls.Primitives |
|
|
|
/// <summary>
|
|
|
|
/// Initializes a new instance of the <see cref="PopupRoot"/> class.
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="parent">The popup parent.</param>
|
|
|
|
/// <param name="impl">The popup implementation.</param>
|
|
|
|
/// <param name="dependencyResolver">
|
|
|
|
/// The dependency resolver to use. If null the default dependency resolver will be used.
|
|
|
|
/// </param>
|
|
|
|
|