maxmustermann/terminal
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix read-only tab dialog to cancel tab closing when dismissed (#9573)

Browse source 
Currently dismissing "are you sure you wish to close read-only tab or pane" 
dialog by pressing `ESC` will not abort tab closing
(aka the tab will be closed!)

The reason for this, is that we cancel, only if the "Cancel" is pressed
(aka result=PrimaryButton, while ESC returns result=None).

This PR fixes this, by doing what we usually do:
* Putting Cancel in the CloseButton (which is also triggered by ESC)
* Aborting the action if the result is not a Primary Button

However, since we want Cancel to be a default action,
we set CloseButton to be the DefaultButton  in XAML
This commit is contained in:
Don-Vito 2021-03-22 13:02:30 +02:00 committed by GitHub
parent 9069fcab79
commit 9bd097f4ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cascadia/TerminalApp/Resources/en-US/Resources.resw
View file

@ -418,10 +418,10 @@
<value>Do you want to close all tabs?</value>
</data>
<data name="CloseReadOnlyDialog.CloseButtonText" xml:space="preserve">
<value>Close anyway</value>
<value>Cancel</value>
</data>
<data name="CloseReadOnlyDialog.PrimaryButtonText" xml:space="preserve">
<value>Cancel</value>
<value>Close anyway</value>
</data>
<data name="CloseReadOnlyDialog.Title" xml:space="preserve">
<value>Warning</value>

8
src/cascadia/TerminalApp/TerminalPage.cpp
View file

@ -1339,8 +1339,8 @@ namespace winrt::TerminalApp::implementation
{
ContentDialogResult warningResult = co_await _ShowCloseReadOnlyDialog();
// The primary action is canceling the removal
if (warningResult == ContentDialogResult::Primary)
// If the user didn't explicitly click on close tab - leave
if (warningResult != ContentDialogResult::Primary)
{
co_return;
}
@ -1736,8 +1736,8 @@ namespace winrt::TerminalApp::implementation
{
ContentDialogResult warningResult = co_await _ShowCloseReadOnlyDialog();
// The primary action is canceling the action
if (warningResult == ContentDialogResult::Primary)
// If the user didn't explicitly click on close tab - leave
if (warningResult != ContentDialogResult::Primary)
{
co_return;
}

2
src/cascadia/TerminalApp/TerminalPage.xaml
View file

@ -57,7 +57,7 @@ the MIT License. See LICENSE in the project root for license information. -->
x:Load="False"
x:Name="CloseReadOnlyDialog"
x:Uid="CloseReadOnlyDialog"
DefaultButton="Primary">
DefaultButton="Close">
</ContentDialog>
<ContentDialog