Application ExitMode #1617
Application ExitMode #1617
Conversation
|
Should we rename OnExiting to OnShutdown and Exit to Shutdown to better reflect what is happening and better match wpf naming? |
There was a problem hiding this comment.
I tested this out by opening another MainWindow in the control catalog when a button is pressed, and setting SetExitMode(ExitMode.OnMainWindowClose);
However, I'm getting an exception when I close the first main window while the second is open:
System.ArgumentOutOfRangeException
HResult=0x80131502
Message=Index was out of range. Must be non-negative and less than the size of the collection.
Parameter name: index
Source=mscorlib
StackTrace:
at System.ThrowHelper.ThrowArgumentOutOfRangeException(ExceptionArgument argument, ExceptionResource resource)
at System.Collections.Generic.List`1.RemoveAt(Int32 index)
at Avalonia.WindowCollection.RemoveAt(Int32 index) in D:\projects\AvaloniaUI\Avalonia\src\Avalonia.Controls\WindowCollection.cs:line 93
|
Will have a look at it and add some unit tests that do exactly what you tried. |
Added unit tests
|
Have fixed the issue with OnMainWindowClose and added unit Tests for every mode. I dont understand why the formatting of some code is different. Maybe StyleCop did that. |
src/Avalonia.Controls/Application.cs
Outdated
| /// </summary> | ||
| /// <param name="token">The token to track</param> | ||
| public void Run(CancellationToken token) | ||
| { | ||
| Dispatcher.UIThread.MainLoop(token); | ||
|
|
||
| if (!IsExiting) |
There was a problem hiding this comment.
This case is needed to call Exit if an error happened. We know that an error happened if Exit wasn't called explicitly so IsExiting isn't set.
src/Avalonia.Controls/Application.cs
Outdated
| } | ||
|
|
||
| /// <summary> | ||
| /// Exits the application | ||
| /// </summary> | ||
| public void Exit() | ||
| { | ||
| IsExiting = true; | ||
|
|
||
| while (Windows.Count > 0) |
There was a problem hiding this comment.
If I have tow Windows that this loop never exit.
I think you should write remove the first windows.
There was a problem hiding this comment.
That's wrong because this line always removes the first window of the collection until none is left. A close removes the window from the list. I will add unit tests to prove that.
| /// <param name="window">The window.</param> | ||
| internal void Remove(Window window) | ||
| { | ||
| _windows.Remove(window); |
There was a problem hiding this comment.
When you remove the window that you should remove the Closed.
window.Closed -= OnWindowClosed;
There was a problem hiding this comment.
Will remove the subscription. Good catch.
|
Will close this and reopen with a clean commit history |
|
if you can change commits history and force push to update your PR |
This PR introduces a way to control when the application exits. You can either let the application exit explicitly or implicitly. Furthermore you can now access the main window and open Windows under the current application instance.
The current state calls exit when the main window was closed and there is no way to control this behavior
You are able to control when the application exits.
In the past all open windows where stored under Window and moved to Application with these changes. A ExitMode property was added to application and a SetExitMode method was added to the AppBuilder.
Checklist:
See #1565