[PR #3465] [MERGED] Break everything out of App except Xaml platform init #25379

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

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/3465
Author: @miniksa
Created: 11/7/2019
Status: ✅ Merged
Merged: 11/7/2019
Merged by: @DHowett-MSFT

Base: master ← Head: dev/miniksa/split_app


📝 Commits (4)

  • dc8f535 Break everything out of App except the base initialization for XAML. AppLogic is the new home.
  • e195c31 codeformat
  • e08a869 deduplicate logics by always using the app one (since it has to be there to support universal launch).
  • deadb0d apparently that was too many cross-boundary calls and we can cache it because winrt objects are magic.

📊 Changes

10 files changed (+880 additions, -780 deletions)

View changed files

📝 src/cascadia/TerminalApp/App.cpp (+35 -642)
📝 src/cascadia/TerminalApp/App.h (+3 -72)
📝 src/cascadia/TerminalApp/App.idl (+4 -34)
➕ src/cascadia/TerminalApp/AppLogic.cpp (+665 -0)
➕ src/cascadia/TerminalApp/AppLogic.h (+98 -0)
➕ src/cascadia/TerminalApp/AppLogic.idl (+44 -0)
📝 src/cascadia/TerminalApp/TerminalApp.vcxproj (+3 -15)
📝 src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj (+7 -0)
📝 src/cascadia/WindowsTerminal/AppHost.cpp (+19 -16)
📝 src/cascadia/WindowsTerminal/AppHost.h (+2 -1)

📄 Description

Summary of the Pull Request

This removes anything in App that isn't the base stuff to set up XAML. This will be necessary for dual-heading it with Centennial & UWP hosts

References

This is part of #3236 but I had to re-do it anyway because of merges. I want to get it submitted so people stop adding stuff to App.

PR Checklist

  • I work here
  • Existing tests should still pass
  • I'm a core contributor

Detailed Description of the Pull Request / Additional comments

@ocalvo tells me that app shouldn't have anything in it but just the init and onload. So I moved everything else to AppLogic and glued it back together.

Validation Steps Performed

Ran the project and launched it locally.


🔄 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/3465 **Author:** [@miniksa](https://github.com/miniksa) **Created:** 11/7/2019 **Status:** ✅ Merged **Merged:** 11/7/2019 **Merged by:** [@DHowett-MSFT](https://github.com/DHowett-MSFT) **Base:** `master` ← **Head:** `dev/miniksa/split_app` --- ### 📝 Commits (4) - [`dc8f535`](https://github.com/microsoft/terminal/commit/dc8f535a4d167742f8eb5d5a08c8627d73b51b40) Break everything out of App except the base initialization for XAML. AppLogic is the new home. - [`e195c31`](https://github.com/microsoft/terminal/commit/e195c31cb7f2f8bd2a78d1934c3126e329ee31dc) codeformat - [`e08a869`](https://github.com/microsoft/terminal/commit/e08a8692040074aa9ce873e23ac16415fb63d81d) deduplicate logics by always using the app one (since it has to be there to support universal launch). - [`deadb0d`](https://github.com/microsoft/terminal/commit/deadb0d124197d9109a8828887715ceb93e910a8) apparently that was too many cross-boundary calls and we can cache it because winrt objects are magic. ### 📊 Changes **10 files changed** (+880 additions, -780 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalApp/App.cpp` (+35 -642) 📝 `src/cascadia/TerminalApp/App.h` (+3 -72) 📝 `src/cascadia/TerminalApp/App.idl` (+4 -34) ➕ `src/cascadia/TerminalApp/AppLogic.cpp` (+665 -0) ➕ `src/cascadia/TerminalApp/AppLogic.h` (+98 -0) ➕ `src/cascadia/TerminalApp/AppLogic.idl` (+44 -0) 📝 `src/cascadia/TerminalApp/TerminalApp.vcxproj` (+3 -15) 📝 `src/cascadia/TerminalApp/lib/TerminalAppLib.vcxproj` (+7 -0) 📝 `src/cascadia/WindowsTerminal/AppHost.cpp` (+19 -16) 📝 `src/cascadia/WindowsTerminal/AppHost.h` (+2 -1) </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)? --> ## Summary of the Pull Request This removes anything in App that isn't the base stuff to set up XAML. This will be necessary for dual-heading it with Centennial & UWP hosts <!-- Other than the issue solved, is this relevant to any other issues/existing PRs? --> ## References This is part of #3236 but I had to re-do it anyway because of merges. I want to get it submitted so people stop adding stuff to App. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist * [x] I work here * [x] Existing tests should still pass * [x] I'm a core contributor <!-- 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 @ocalvo tells me that app shouldn't have anything in it but just the init and onload. So I moved everything else to `AppLogic` and glued it back together. <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed Ran the project and launched it locally. --- <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:09:09 +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#25379