[PR #12840] [MERGED] Manually put our ContentDialogs in the tab content, rather than above #29260

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

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/12840
Author: @zadjii-msft
Created: 4/6/2022
Status: Merged
Merged: 4/6/2022
Merged by: @undefined

Base: mainHead: dev/migrie/b/12775-holes-starting-shia-lebouf


📝 Commits (6)

  • e93325a 27 - Once Again, With Feeling
  • 7c017fc Revert "Fix showing a dialog multiple times (#12625)"
  • ab3fdf9 Revert "No longer load content dialogs when there is already one being shown (#12517)"
  • c8e3128 Update src/cascadia/TerminalApp/TerminalPage.xaml
  • 5ec5f01 Merge remote-tracking branch 'origin/main' into dev/migrie/b/12775-holes-starting-shia-lebouf
  • 88e00cb this helper was still useful, even if the rest of the commit was reverted

📊 Changes

7 files changed (+32 additions, -41 deletions)

View changed files

📝 src/cascadia/TerminalApp/AppLogic.cpp (+1 -13)
📝 src/cascadia/TerminalApp/AppLogic.h (+0 -1)
📝 src/cascadia/TerminalApp/AppLogic.idl (+5 -0)
📝 src/cascadia/TerminalApp/TerminalPage.cpp (+1 -16)
📝 src/cascadia/TerminalApp/TerminalPage.h (+0 -1)
📝 src/cascadia/TerminalApp/TerminalPage.idl (+0 -2)
📝 src/cascadia/TerminalApp/TerminalPage.xaml (+25 -8)

📄 Description

After switching to ControlsV2, it seems that
delay-loading a dialog causes the ContentDialog to be assigned a
Height equal to it's content size. If we DON'T assign the
ContentDialog a Row, I believe it's assigned Row 0 by default. So,
when the dialog gets opened, the dialog seemingly causes a giant
hole to appear in the body of the app.

Assigning all the dialogs to Row 2 (where the rest of the content
is) makes the "hole" appear in the same space as the rest of the
TabContent, fixing the issue.

Note that the actual content in a content dialog gets parented to
the PopupRoot, so it actually always appeared in the correct place, it's
just this weird hole that appeared in Row 0.


🔄 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/12840 **Author:** [@zadjii-msft](https://github.com/zadjii-msft) **Created:** 4/6/2022 **Status:** ✅ Merged **Merged:** 4/6/2022 **Merged by:** [@undefined](undefined) **Base:** `main` ← **Head:** `dev/migrie/b/12775-holes-starting-shia-lebouf` --- ### 📝 Commits (6) - [`e93325a`](https://github.com/microsoft/terminal/commit/e93325a7a04cdd23a30bdb9970c74199a0d6eeb5) 27 - Once Again, With Feeling - [`7c017fc`](https://github.com/microsoft/terminal/commit/7c017fc606069851d49463c36d67b4df1e8b0dc5) Revert "Fix showing a dialog multiple times (#12625)" - [`ab3fdf9`](https://github.com/microsoft/terminal/commit/ab3fdf96681c7b1f8526ec406e6925d3dcd99768) Revert "No longer load content dialogs when there is already one being shown (#12517)" - [`c8e3128`](https://github.com/microsoft/terminal/commit/c8e312855132f90b8079b1cf284c73b83d200204) Update src/cascadia/TerminalApp/TerminalPage.xaml - [`5ec5f01`](https://github.com/microsoft/terminal/commit/5ec5f01709d8195ebe78373b5f1bd8b0e6906d52) Merge remote-tracking branch 'origin/main' into dev/migrie/b/12775-holes-starting-shia-lebouf - [`88e00cb`](https://github.com/microsoft/terminal/commit/88e00cbbd2a38668921fed8283a0c11d31f44bd9) this helper was still useful, even if the rest of the commit was reverted ### 📊 Changes **7 files changed** (+32 additions, -41 deletions) <details> <summary>View changed files</summary> 📝 `src/cascadia/TerminalApp/AppLogic.cpp` (+1 -13) 📝 `src/cascadia/TerminalApp/AppLogic.h` (+0 -1) 📝 `src/cascadia/TerminalApp/AppLogic.idl` (+5 -0) 📝 `src/cascadia/TerminalApp/TerminalPage.cpp` (+1 -16) 📝 `src/cascadia/TerminalApp/TerminalPage.h` (+0 -1) 📝 `src/cascadia/TerminalApp/TerminalPage.idl` (+0 -2) 📝 `src/cascadia/TerminalApp/TerminalPage.xaml` (+25 -8) </details> ### 📄 Description After switching to ControlsV2, it seems that delay-loading a dialog causes the ContentDialog to be assigned a Height equal to it's content size. If we DON'T assign the ContentDialog a Row, I believe it's assigned Row 0 by default. So, when the dialog gets opened, the dialog seemingly causes a giant hole to appear in the body of the app. Assigning all the dialogs to Row 2 (where the rest of the content is) makes the "hole" appear in the same space as the rest of the TabContent, fixing the issue. Note that the actual content in a content dialog gets parented to the PopupRoot, so it actually always appeared in the correct place, it's just this weird hole that appeared in Row 0. * [x] Closes #12775 * See also: * #12202 was fixed by #12208 * #12447 was fixed by #12517 * [x] Tested manually * [x] Reverts #12625 * [x] Reverts #12517 --- <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:33:48 +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#29260