[PR #11224] [MERGED] Add shield to tab row when elevated #28465

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

📋 Pull Request Information

Original PR: https://github.com/microsoft/terminal/pull/11224
Author: @zadjii-msft
Created: 9/14/2021
Status: Merged
Merged: 9/23/2021
Merged by: @undefined

Base: mainHead: dev/migrie/f/uac-shield


📝 Commits (10+)

  • 04dcd2b add shield to titlebar
  • 009ef14 move where the shield is hosted, make it actually dependent on elevation state
  • 2acaedf Add a setting too
  • 2899222 Merge branch 'main' into dev/migrie/f/uac-shield
  • 05679bc add a tooltip too
  • b436935 schema yes yes I know
  • 5481e00 Merge remote-tracking branch 'origin/main' into dev/migrie/f/uac-shield
  • 26aad5e friendship ended with stackpanel ; grid is my best friend now
  • 71e6d62 huh, this clone doesn't auto-format
  • f29882c dont need this

📊 Changes

11 files changed (+64 additions, -14 deletions)

View changed files

📝 doc/cascadia/profiles.schema.json (+5 -0)
📝 src/cascadia/TerminalApp/Resources/en-US/Resources.resw (+3 -0)
📝 src/cascadia/TerminalApp/TabRowControl.h (+4 -0)
📝 src/cascadia/TerminalApp/TabRowControl.idl (+3 -1)
📝 src/cascadia/TerminalApp/TabRowControl.xaml (+11 -0)
📝 src/cascadia/TerminalApp/TerminalPage.cpp (+28 -13)
📝 src/cascadia/TerminalApp/TerminalPage.h (+1 -0)
📝 src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp (+6 -0)
📝 src/cascadia/TerminalSettingsModel/GlobalAppSettings.h (+1 -0)
📝 src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl (+1 -0)
📝 src/cascadia/TerminalSettingsModel/defaults.json (+1 -0)

📄 Description

Summary of the Pull Request

Adds a visible indicator that a Terminal window is elevated. This icon can be disabled with "showAdminShield" false in the global settings.

References

PR Checklist

Validation Steps Performed

image

image


🔄 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/11224 **Author:** [@zadjii-msft](https://github.com/zadjii-msft) **Created:** 9/14/2021 **Status:** ✅ Merged **Merged:** 9/23/2021 **Merged by:** [@undefined](undefined) **Base:** `main` ← **Head:** `dev/migrie/f/uac-shield` --- ### 📝 Commits (10+) - [`04dcd2b`](https://github.com/microsoft/terminal/commit/04dcd2be754d56eca5141c10d58130864cbae207) add shield to titlebar - [`009ef14`](https://github.com/microsoft/terminal/commit/009ef144cd2788531795d79e0a3f3091cc1841d4) move where the shield is hosted, make it actually dependent on elevation state - [`2acaedf`](https://github.com/microsoft/terminal/commit/2acaedff56262e0f9c61c99557cee02b9b59e5a7) Add a setting too - [`2899222`](https://github.com/microsoft/terminal/commit/2899222dba6de5a7a090821c7c2bb2f8ceaa6da0) Merge branch 'main' into dev/migrie/f/uac-shield - [`05679bc`](https://github.com/microsoft/terminal/commit/05679bc26a0e08a581c1c12c36a3cf68eca10938) add a tooltip too - [`b436935`](https://github.com/microsoft/terminal/commit/b4369355602e0bf689c63b20cf393006b3007288) schema yes yes I know - [`5481e00`](https://github.com/microsoft/terminal/commit/5481e005bada280b382548087275a6b12119632a) Merge remote-tracking branch 'origin/main' into dev/migrie/f/uac-shield - [`26aad5e`](https://github.com/microsoft/terminal/commit/26aad5e26de5113cf250548c11ab3574f7d5b4df) friendship ended with stackpanel ; grid is my best friend now - [`71e6d62`](https://github.com/microsoft/terminal/commit/71e6d62decb51458478d04b0ee033f8b50321f64) huh, this clone doesn't auto-format - [`f29882c`](https://github.com/microsoft/terminal/commit/f29882c0f6556d5455af81bc405877d07f4b507a) dont need this ### 📊 Changes **11 files changed** (+64 additions, -14 deletions) <details> <summary>View changed files</summary> 📝 `doc/cascadia/profiles.schema.json` (+5 -0) 📝 `src/cascadia/TerminalApp/Resources/en-US/Resources.resw` (+3 -0) 📝 `src/cascadia/TerminalApp/TabRowControl.h` (+4 -0) 📝 `src/cascadia/TerminalApp/TabRowControl.idl` (+3 -1) 📝 `src/cascadia/TerminalApp/TabRowControl.xaml` (+11 -0) 📝 `src/cascadia/TerminalApp/TerminalPage.cpp` (+28 -13) 📝 `src/cascadia/TerminalApp/TerminalPage.h` (+1 -0) 📝 `src/cascadia/TerminalSettingsModel/GlobalAppSettings.cpp` (+6 -0) 📝 `src/cascadia/TerminalSettingsModel/GlobalAppSettings.h` (+1 -0) 📝 `src/cascadia/TerminalSettingsModel/GlobalAppSettings.idl` (+1 -0) 📝 `src/cascadia/TerminalSettingsModel/defaults.json` (+1 -0) </details> ### 📄 Description ## Summary of the Pull Request Adds a visible indicator that a Terminal window is elevated. This icon can be disabled with `"showAdminShield" false` in the global settings. ## References * spec'd in #8455 * Also in https://github.com/microsoft/terminal/projects/5 * big picture: #5000 ## PR Checklist * [x] Closes #1939 * [x] I work here * [n/a] Tests added/passed * [ ] Requires documentation to be updated - yea probably ## Validation Steps Performed ![image](https://user-images.githubusercontent.com/18356694/133293009-4215e319-fbf9-4ca8-8af5-afe2fa8bb62d.png) ![image](https://user-images.githubusercontent.com/18356694/133292970-90cb17fd-16c7-429a-a25f-8457850eb278.png) --- <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:28:42 +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#28465