[PR #3049] [MERGED] Provide the CloseWindow warning experience for the 'X' button #25220

Open
opened 2026-01-31 09:08:04 +00:00 by claunia · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/3049
Author: @KaiyuWang16
Created: 10/3/2019
Status: Merged
Merged: 10/11/2019
Merged by: @DHowett-MSFT

Base: masterHead: dev/kawa/1589-follow-up-connect-CloseWindow-Action-with-X-button


📝 Commits (5)

  • 879bdbb Warning User of multiple tabs opened when X button is clicked - IslandWindow
  • ebc56d3 Merge branch 'master' into dev/kawa/1589-follow-up-connect-CloseWindow-Action-with-X-button
  • 488dc3a Add comments and fix method names
  • 240f820 Implement close warning experience for Nonclient island window
  • b542238 Fix format issue

📊 Changes

10 files changed (+39 additions, -5 deletions)

View changed files

📝 src/cascadia/TerminalApp/App.cpp (+16 -0)
📝 src/cascadia/TerminalApp/App.h (+2 -0)
📝 src/cascadia/TerminalApp/App.idl (+1 -0)
📝 src/cascadia/TerminalApp/AppActionHandlers.cpp (+1 -1)
📝 src/cascadia/TerminalApp/TerminalPage.cpp (+2 -2)
📝 src/cascadia/TerminalApp/TerminalPage.h (+2 -1)
📝 src/cascadia/TerminalApp/TitlebarControl.cpp (+1 -1)
📝 src/cascadia/WindowsTerminal/AppHost.cpp (+4 -0)
📝 src/cascadia/WindowsTerminal/IslandWindow.cpp (+9 -0)
📝 src/cascadia/WindowsTerminal/IslandWindow.h (+1 -0)

📄 Description

This is a follow up project of #1589 , which warns users of multiple tabs opened when press ALT+F4.
Now we are going to connect this experience with the 'X' button of the window.

For now, this PR only includes the implementation for IslandWindow (client window). Non-client window experience is still under implementation.

References

PR Checklist

  • Closes #xxx
  • CLA signed. If not, go over here and sign the CLA
  • Tests added/passed
  • Requires documentation to be updated
  • I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Detailed Description of the Pull Request / Additional comments

To Test:

  1. Start terminal.
  2. Open multiple tabs.
  3. Click 'X' on the top right corner of the window.
  4. You should be able to see a warning. If you cancel it, then the Terminal keeps running.
  5. If you click 'Close', then the app will close.
  6. If you only have one tab opened, and click 'X', the app should close directly without any warnings.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/microsoft/terminal/pull/3049 **Author:** [@KaiyuWang16](https://github.com/KaiyuWang16) **Created:** 10/3/2019 **Status:** ✅ Merged **Merged:** 10/11/2019 **Merged by:** [@DHowett-MSFT](https://github.com/DHowett-MSFT) **Base:** `master` ← **Head:** `dev/kawa/1589-follow-up-connect-CloseWindow-Action-with-X-button` --- ### 📝 Commits (5) - [`879bdbb`](https://github.com/microsoft/terminal/commit/879bdbb6bc701ad8cfa42f5b51aa1f31d0c288bd) Warning User of multiple tabs opened when X button is clicked - IslandWindow - [`ebc56d3`](https://github.com/microsoft/terminal/commit/ebc56d33d86ca303712aea17893d65afbd3b82a2) Merge branch 'master' into dev/kawa/1589-follow-up-connect-CloseWindow-Action-with-X-button - [`488dc3a`](https://github.com/microsoft/terminal/commit/488dc3a937003e4663c3064576e5b7a0af59e9e3) Add comments and fix method names - [`240f820`](https://github.com/microsoft/terminal/commit/240f820b689a4be753f670aefc3039d8245a96e3) Implement close warning experience for Nonclient island window - [`b542238`](https://github.com/microsoft/terminal/commit/b54223884852864a223353c9c87333100f96b138) Fix format issue ### 📊 Changes **10 files changed** (+39 additions, -5 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalApp/App.cpp` (+16 -0) 📝 `src/cascadia/TerminalApp/App.h` (+2 -0) 📝 `src/cascadia/TerminalApp/App.idl` (+1 -0) 📝 `src/cascadia/TerminalApp/AppActionHandlers.cpp` (+1 -1) 📝 `src/cascadia/TerminalApp/TerminalPage.cpp` (+2 -2) 📝 `src/cascadia/TerminalApp/TerminalPage.h` (+2 -1) 📝 `src/cascadia/TerminalApp/TitlebarControl.cpp` (+1 -1) 📝 `src/cascadia/WindowsTerminal/AppHost.cpp` (+4 -0) 📝 `src/cascadia/WindowsTerminal/IslandWindow.cpp` (+9 -0) 📝 `src/cascadia/WindowsTerminal/IslandWindow.h` (+1 -0) </details> ### 📄 Description <!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> This is a follow up project of #1589 , which warns users of multiple tabs opened when press ALT+F4. Now we are going to connect this experience with the 'X' button of the window. For now, this PR only includes the implementation for IslandWindow (client window). Non-client window experience is still under implementation. <!-- Other than the issue solved, is this relevant to any other issues/existing PRs? --> ## References <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [ ] Closes #xxx * [ ] CLA signed. If not, go over [here](https://cla.opensource.microsoft.com/microsoft/Terminal) and sign the CLA * [ ] Tests added/passed * [ ] Requires documentation to be updated * [ ] I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> To Test: 1. Start terminal. 2. Open multiple tabs. 3. Click 'X' on the top right corner of the window. 4. You should be able to see a warning. If you cancel it, then the Terminal keeps running. 5. If you click 'Close', then the app will close. 6. If you only have one tab opened, and click 'X', the app should close directly without any warnings. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
claunia added the pull-request label 2026-01-31 09:08:04 +00:00
Sign in to join this conversation.
No Label pull-request
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/terminal#25220