wip

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 
 contact_links:
   - name: Microsoft Security Response Center 🔐

.github/actions/spelling/allow/allow.txt

@@ -67,14 +67,11 @@ servicebus
 slnt
 stakeholders
 subpage
-subpages
 sustainability
 sxn
 Tencent
 toolset
-Uids
 UEFI
-UIDs
 uiatextrange
 und
 vsdevcmd

.github/actions/spelling/expect/expect.txt

@@ -256,6 +256,7 @@ conterm
 contsf
 contypes
 conwinuserrefs
+coordnew
 COPYCOLOR
 COPYDATA
 COPYDATASTRUCT
@@ -621,6 +622,7 @@ fuzzmap
 fuzzwrapper
 fwdecl
 fwe
+fwlink
 fzf
 gci
 gcx

build/StoreSubmission/Preview/PDPs/de-DE/PDP.xml

@@ -56,10 +56,9 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme der Com
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Endlich die Möglichkeit, nach beliebigen Einstellungen zu suchen!
-– Ein neuer nativer Editor für Tastenkombinationen, Aktionen und Einträge in der Befehlspalette.
-– Neue Community-Übersetzungen für Serbisch und Ukrainisch
-– Unterstützung für das „Kitty“-Tastaturprotokoll für hochauflösende Eingabecodierung
+– Eine komplett neue Erweiterungsseite, die anzeigt, was in Ihrem Terminal installiert ist
+– Die Befehlspalette wird jetzt sowohl in Ihrer Muttersprache als auch auf Englisch angezeigt
+– Neue VT-Features wie synchronisiertes Rendering, neue Farbschemas, Konfiguration für schnelle Mausaktionen wie Zoomen und mehr
 
 Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/en-US/PDP.xml

@@ -54,12 +54,11 @@ This is an open source project and we welcome community participation. To partic
     <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
   </DevStudio>
   <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe}{Locked=Kitty} App Release Note" -->Version __VERSION_NUMBER__
+    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Version __VERSION_NUMBER__
 
-- Finally, the ability to search for any setting!
-- A new native editor for key bindings, actions and command palette entries.
-- New community localizations to Serbian and Ukrainian
-- Support for the "Kitty" keyboard protocol for high-fidelity input encoding
+- A whole new Extensions page that shows what has been installed into your Terminal
+- Command Palette now shows up in your native language as well as English
+- New VT features such as synchronized rendering, new color schemes, configuration for quick mouse actions like zooming, and more
 
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/es-ES/PDP.xml

@@ -54,12 +54,11 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
     
   </DevStudio>
   <ReleaseNotes>
-    Version __VERSION_NUMBER__
+    Versión __VERSION_NUMBER__
 
-- Por último, la capacidad de buscar cualquier configuración.
-- Nuevo editor nativo para asignaciones de teclas, acciones y entradas de la paleta de comandos.
-- Nuevas localizaciones comunitarias para serbio y ucraniano
-- Soporte para el protocolo de teclado "Kitty" para codificación de entrada de alta fidelidad
+- Página Extensiones completamente nueva que muestra lo que se ha instalado en tu terminal
+- La paleta de comandos ahora se muestra en tu idioma nativo, así como en inglés
+- Nuevas características de VT, como la representación sincronizada, nuevos esquemas de color, configuración para acciones rápidas del ratón, como el zoom, y más
 
 Consulta la página de versiones de GitHub para más información.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/fr-FR/PDP.xml

@@ -56,12 +56,11 @@ Il s’agit d’un projet open source et nous vous invitons à participer dans l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Enfin, la possibilité de rechercher n’importe quel paramètre !
-- Un nouvel éditeur natif pour les raccourcis clavier, les actions et les entrées de la palette de commandes.
-- De nouvelles localisations communautaires en serbe et en ukrainien
-- Une prise en charge du protocole clavier « Kitty » pour un encodage d’entrée à haute fidélité
+- Une toute nouvelle page Extensions qui montre ce qui a été installé dans votre terminal
+- La palette de commandes s’affiche désormais dans votre langue native, ainsi qu’en anglais
+- Nouvelles fonctionnalités VT telles que le rendu synchronisé, de nouveaux schémas de couleurs, la configuration pour des actions rapides de la souris comme le zoom, et plus encore
 
-Consultez notre page des versions de GitHub pour plus de détails.
+Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/it-IT/PDP.xml

@@ -54,12 +54,11 @@ Si tratta di un progetto open source e la partecipazione della community è molt
     
   </DevStudio>
   <ReleaseNotes>
-    Versione __VERSION_NUMBER__
+    Versione __VERSION_NUMBER__ 
 
-- Finalmente è possibile cercare qualsiasi impostazione
-- Nuovo editor nativo per le associazioni di tasti, le azioni e le voci del riquadro comandi.
-- Nuove localizzazioni della community in serbo e ucraino
-- Supporto per il protocollo di tastiera "Kitty" per una codifica dell'input ad alta fedeltà
+- Una pagina Estensioni completamente nuova che mostra ciò che è stato installato nel terminale
+- Il riquadro comandi ora viene visualizzato nella tua lingua di origine oltre che in inglese
+- Nuove funzionalità VT come il rendering sincronizzato, le nuove combinazioni di colori, la configurazione per azioni rapide del mouse come lo zoom e altro ancora
 
 Per altri dettagli, vedi la pagina delle release di GitHub.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/ja-JP/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- 最後に、任意の設定を検索する機能です。
-- キー バインド、アクション、コマンド パレット エントリ用の新しいネイティブ エディター。
-- セルビア語とウクライナ語への新しいコミュニティ ローカライズ
-- 高忠実度入力エンコード用の "Kitty" キーボード プロトコルのサポート
+- ターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
+- コマンド パレットがネイティブ言語と英語で表示されるようになりました
+- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能
 
 詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/ko-KR/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 드디어 모든 설정을 검색할 수 있게 되었어요!
-- 키 바인딩, 작업, 명령 팔레트 항목을 위한 새로운 기본 편집기가 추가되었습니다.
-- 세르비아어와 우크라이나어 커뮤니티 지역화를 새롭게 지원합니다.
-- 고품질 입력 인코딩을 위해 "Kitty" 키보드 프로토콜을 지원합니다.
+- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
+- 명령 팔레트가 이제 영어뿐만 아니라 모국어로도 표시
+- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능이 추가
 
-자세한 정보는 GitHub 릴리스 페이지를 참고하세요.
+자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/pt-BR/PDP.xml

@@ -56,10 +56,9 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Finalmente, a possibilidade de pesquisar qualquer configuração!
-- Um novo editor nativo para combinações de teclas, ações e entradas na paleta de comandos.
-- Novas localizações da comunidade para sérvio e ucraniano
-- Suporte para o protocolo de teclado "Kitty" para codificação de entrada de alta fidelidade
+– Uma nova página de Extensões que mostra o que foi instalado no seu Terminal
+– A Paleta de Comandos agora aparece no seu idioma nativo, além do inglês
+– Novos recursos da VT, como renderização sincronizada, novos esquemas de cores, configuração para ações rápidas do mouse, como zoom, e muito mais
 
 Confira nossa página de lançamentos no GitHub para obter mais detalhes.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/qps-ploc/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-ploca/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/qps-plocm/PDP.xml

@@ -56,12 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- ₣ïňάĺĺў, ŧне âъΐŀίťŷ ţø şēаґсђ ƒбг ăиÿ şēťτіήġ! !!! !!! !!! !!! !!!
-- Á ŋеώ ñăŧїνе ěðíτōг ƒοѓ ќэÿ вїñďĭňğş, дčтιθήѕ дñð çθmmãήδ ρàľěţťę ёñтгĩέś. !!! !!! !!! !!! !!! !!! !!! !
-- Пėώ čоmmμñìтў ŀό¢àłįżåţίòйš ŧō Šэґъιäñ åηδ Ůκŗăįлīăπ !!! !!! !!! !!! !!! !
-- Ѕυррòŗт ƒòŗ ťĥё "Kitty" ĸ℮ŷъøàŗď ρřŏťô¢õℓ ƒŏґ нįģћ-ƒíđёℓïтÿ îńрüť êńсøďíлğ !!! !!! !!! !!! !!! !!! !!! !
+- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
+- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
+- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
 
-Ρŀ℮âѕē şєё όûя ĜîтΗūь ŕεĺĕǻŝёš раġĕ ƒŏґ ãδđϊŧïбπåľ δеτáΐłś. !!! !!! !!! !!! !!! !!!
+Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Preview/PDPs/ru-RU/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Наконец-то появилась возможность поиска любых параметров!
-– Новый собственный редактор для настраиваемых сочетаний клавиш, действий и записей палитры команд.
-– Новые локализации сообщества на сербский и украинский языки
-– Поддержка протокола клавиатуры Kitty для высокоточного кодирования ввода
+– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
+– Палитра команд теперь доступна на вашем языке, а также на английском
+– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.
 
 Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/sr-Cyrl-RS/PDP.xml

@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="sr-cyrl-rs" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Терминал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Конзола</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-    <!-- _locComment_text="{MaxLength=10000} App Description" -->Ово је изградња прегледа апликације Windows терминал. Она садржи најновије могућности које се још увек развијају. Windows терминал је модерна, брза, ефикасна, моћна и продуктивна апликација терминала за кориснике алата из командне линије и љуски као што су Command Prompt, PowerShell, и WSL. Неке од његових главних функционалности су вишеструке картице, панели, подршка за Уникод и UTF-8, GPU убрзани механизам за исцртавање текста, произвољне теме, стилови и конфигурације.
-
-Ово је пројекат отвореног кода и учешће заједнице је добродошло. Ако желите да учествујете, молимо вас да посетите https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe}{Locked=Kitty} App Release Note" -->Верзија __VERSION_NUMBER__
-
-- Коначно, могућност претраге било ког подешавања!
-- Нови својствени едитор ставки пречица на тастатури, акција и командне палете
-- Нова локализација заједнице на српски и украјински језик
-- Подршка за „Kitty” протокол тастатуре који омогућава верно кодирање уноса
-
-За више детаља, молимо вас да посетите нашу GitHub страницу издања.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Нови Windows терминал</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Вишеструке картице</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Пуна Уникод подршка</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->GPU-убрзано исцртавање текста</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Потпуна прилагодљивост</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Подела панела</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Тастатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Copyright (c) Microsoft Corporation</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>

build/StoreSubmission/Preview/PDPs/uk-UA/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
 
-- Нарешті, можливість пошуку будь-якого налаштування!
-- Новий вбудований редактор для прив'язки клавіш, дій та палітри команд.
-- Нові локалізації спільноти на сербську та українську мови.
-- Підтримка протоколу клавіатури "Kitty" для високоточного кодування введення.
+- Цілком нова сторінка розширень, яка показує, що було встановлено у вашому терміналі
+- Палітра команд тепер відображається вашою рідною мовою, а також англійською
+- Нові функції віртуального автомата, такі як синхронізований рендеринг, нові колірні схеми, налаштування для швидких дій миші, таких як масштабування, тощо
 
 Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/zh-CN/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 终于可以搜索任何设置了!
-- 新增用于键绑定、操作和命令面板条目的原生编辑器。
-- 新增塞尔维亚语和乌克兰语社区本地化支持
-- 支持 "Kitty" 键盘协议，实现高保真输入编码
+- 一个全新的“扩展”页，显示已安装到终端的内容
+- 命令面板现在以你的母语和英语显示
+- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Preview/PDPs/zh-TW/PDP.xml

@@ -56,10 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 終於，提供可搜尋任何設定的功能!
-- 全新原生編輯器，支援按鍵繫結、動作及命令選擇區項目。
-- 新增社群本地語系化，包含塞爾維亞語與烏克蘭語
-- 支援高保真度輸入編碼的「Kitty」鍵盤通訊協定
+- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
+- 命令選擇區現在以您的母語和英文顯示
+- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等
 
 如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/de-DE/PDP.xml

@@ -56,9 +56,9 @@ Dies ist ein Open Source-Projekt, und wir freuen uns über die Teilnahme an der
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Eine komplett neue Erweiterungsseite, die anzeigt, was in Ihrem Terminal installiert ist
-– Die Befehlspalette wird jetzt sowohl in Ihrer Muttersprache als auch auf Englisch angezeigt
-– Neue VT-Features wie synchronisiertes Rendering, neue Farbschemas, Konfiguration für schnelle Mausaktionen wie Zoomen und mehr
+– Wir haben der Benutzeroberfläche Dutzende von Einstellungen hinzugefügt, die nur einmal in der JSON-Datei vorhanden waren, einschließlich einer neuen Seite zum Anpassen des Layouts Ihres Menüs „Neue Registerkarte“!
+– Wir haben die Fensterverwaltung umgestaltet, um die Zuverlässigkeit zu verbessern. Melden Sie alle Fehler, die beim alias „wt.exe“ auftreten
+– Profile zeigen jetzt ein Symbol an, wenn sie ausgeblendet wurden oder auf Programme verweisen, die deinstalliert wurden.
 
 Weitere Informationen finden Sie auf unserer GitHub-Releaseseite.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/en-US/PDP.xml

@@ -56,9 +56,9 @@ This is an open source project and we welcome community participation. To partic
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Version __VERSION_NUMBER__
 
-- A whole new Extensions page that shows what has been installed into your Terminal
-- Command Palette now shows up in your native language as well as English
-- New VT features such as synchronized rendering, new color schemes, configuration for quick mouse actions like zooming, and more
+- We've added dozens of settings to the UI that once only existed in the JSON file, including a new page for customizing the layout of your New Tab menu!
+- We have rearchitected window management to improve reliability; please file any bugs you encounter with the wt.exe alias
+- Profiles now show an icon if they've been hidden or refer to programs which were uninstalled.
 
 Please see our GitHub releases page for additional details.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/es-ES/PDP.xml

@@ -56,9 +56,9 @@ Este es un proyecto de fuente abierta y animamos a la comunidad a participar. Pa
   <ReleaseNotes>
     Versión __VERSION_NUMBER__
 
-- Página Extensiones completamente nueva que muestra lo que se ha instalado en tu terminal
-- La paleta de comandos ahora se muestra en tu idioma nativo, así como en inglés
-- Nuevas características de VT, como la representación sincronizada, nuevos esquemas de color, configuración para acciones rápidas del ratón, como el zoom, y más
+- Hemos añadido decenas de configuraciones a la interfaz de usuario que antes solo existían en el archivo JSON, incluida una nueva página para personalizar el diseño del menú Nueva pestaña.
+- Hemos reestructurado la gestión de ventanas para mejorar la fiabilidad; informe de cualquier error que encuentre con el alias wt.exe
+- Ahora, los perfiles muestran un icono si han sido ocultados o hacen referencia a programas que han sido desinstalados.
 
 Consulte la página de versiones de GitHub para más información.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/fr-FR/PDP.xml

@@ -56,11 +56,11 @@ Il s’agit d’un projet open source et nous encourageons la participation à l
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- Une toute nouvelle page Extensions qui affiche ce qui a été installé dans votre Terminal
-- La palette de commandes s’affiche désormais dans votre langue native, ainsi qu’en anglais
-- De nouvelles fonctionnalités VT, telles que le rendu synchronisé, de nouveaux schémas de couleurs, une configuration pour des actions rapides de la souris comme le zoom, et bien plus encore
+- Nous avons ajouté des dizaines de paramètres à l’interface utilisateur qui n’existaient auparavant que dans le fichier JSON, y compris une nouvelle page pour personnaliser la disposition de votre menu Nouvel onglet.
+- Nous avons fait une refonte de la gestion des fenêtres pour améliorer la fiabilité. Veuillez signaler les bogues que vous rencontrez avec l’alias wt.exe.
+- Les profils affichent désormais une icône s’ils ont été masqués ou s’ils font référence à des programmes qui ont été désinstallés.
 
-Consultez notre page des versions de GitHub pour plus de détails.
+Veuillez consulter notre page des versions GitHub pour découvrir d’autres détails.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/it-IT/PDP.xml

@@ -56,9 +56,9 @@ Si tratta di un progetto open source e la partecipazione della community è molt
   <ReleaseNotes>
     Versione __VERSION_NUMBER__
 
-- Una pagina Estensioni completamente nuova che mostra ciò che è stato installato nel terminale
-- Il riquadro comandi ora viene visualizzato nella tua lingua di origine oltre che in inglese
-- Nuove funzionalità VT come il rendering sincronizzato, le nuove combinazioni di colori, la configurazione per azioni rapide del mouse come lo zoom e altro ancora
+- Abbiamo aggiunto decine di impostazioni all'interfaccia utente che in precedenza esistevano solo nel file JSON, inclusa una nuova pagina per personalizzare il layout del menu Nuova scheda.
+- Abbiamo riprogettato la gestione delle finestre per migliorarne l'affidabilità; segnala eventuali bug riscontrati con l'alias wt.exe
+- I profili ora mostrano un'icona se sono stati nascosti o se fanno riferimento a programmi disinstallati.
 
 Per altri dettagli, vedi la pagina delle release di GitHub.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/ja-JP/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     バージョン __VERSION_NUMBER__
 
-- お使いのターミナルに何がインストールされているかを表示する新しい [拡張機能] ページ
-- コマンド パレットがネイティブ言語と英語で表示されるようになりました
-- 同期レンダリング、新しい配色、ズームなどのクイック マウス操作の構成などの、新しい VT 機能
+- 新しいタブ メニューのレイアウトをカスタマイズするための新しいページなど、以前は JSON ファイルにしかなかった設定が UI に多数追加されました。
+- 信頼性を向上させるために、ウィンドウ管理を再設計しました。wt.exe エイリアスで発生したバグを報告してください
+- プロファイルが非表示になっている場合や、アンインストールされたプログラムを参照している場合に、アイコンが表示されるようになりました。
 
 詳細については、GitHub リリース ページをご覧ください。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/ko-KR/PDP.xml

@@ -56,11 +56,11 @@
   <ReleaseNotes>
     버전 __VERSION_NUMBER__
 
-- 터미널에 설치된 항목을 보여 주는 완전히 새로운 확장 페이지
-- 이제 영어뿐만 아니라 모국어로도 표시되는 명령 팔레트
-- 동기화된 렌더링, 새로운 색 구성표, 확대/축소와 같은 빠른 마우스 동작을 위한 구성 등 새로운 VT 기능 추가
+- 새 탭 메뉴의 레이아웃을 사용자 지정하기 위한 새 페이지를 포함하여 JSON 파일에만 존재했던 수십 개의 설정을 UI에 추가
+- 안정성을 개선하기 위해 창 관리 구조를 재구성했습니다. wt.exe 별칭과 관련하여 발생한 버그 신고
+- 프로필이 숨겨졌거나 제거된 프로그램을 참조하는 경우 이제 프로필에 아이콘이 표시됩니다.
 
-자세한 정보는 GitHub 릴리스 페이지를 참고하세요.
+자세한 내용은 GitHub 릴리스 페이지를 참조하세요.
   </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/pt-BR/PDP.xml

@@ -56,9 +56,9 @@ Este é um projeto de código aberto e a participação da comunidade é bem-vin
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-– Uma nova página de Extensões que mostra o que foi instalado no seu Terminal
-– A Paleta de Comandos agora aparece no seu idioma nativo, além do inglês
-– Novos recursos da VT, como renderização sincronizada, novos esquemas de cores, configuração para ações rápidas do mouse, como zoom, e muito mais
+– Adicionamos várias configurações à interface do usuário que antes só existiam no arquivo JSON, incluindo uma nova página para personalizar o layout do seu menu Nova Guia!
+– Reestruturamos o gerenciamento de janelas para melhorar a confiabilidade; registre os bugs que você encontrar com o alias wt.exe
+– Os perfis agora exibem um ícone se estiverem ocultos ou se referirem a programas que foram desinstalados.
 
 Confira nossa página de lançamentos no GitHub para obter mais detalhes.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/qps-ploc/PDP.xml

@@ -56,11 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
-- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
-- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εʼnćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
 
-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-ploca/PDP.xml

@@ -56,11 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
-- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
-- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εʼnćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
 
-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/qps-plocm/PDP.xml

@@ -56,11 +56,11 @@
   <ReleaseNotes>
     Vėѓѕіöй __VERSION_NUMBER__ !!! !!! !
 
-- Ą ωћόĺé ņέш ∑×τзńşĩōиŝ ρâģε τђат šнòωş ωħąт нǻś ъеēñ įηšтǻľĺéδ ĭʼnтο ўбμŗ Ţзřmĭňāŀ !!! !!! !!! !!! !!! !!! !!! !!! 
-- €όммаήδ Рдĺēтţĕ пŏẅ şĥŏшś üρ ϊñ ỳоũѓ йαťïνє ļäŋģµаġέ άś ŵєŀľ åś Σиĝℓĭŝђ !!! !!! !!! !!! !!! !!! !!! 
-- ∏еẅ VΤ ƒэåŧύґέŝ şűçн ăŝ ѕỳňсĥŗǿйìźėð гēŋďзříⁿğ, ηĕш ćôĺõг şĉћěмєѕ, çóńƒіĝџŗáτїöπ ƒοг qũī¢ķ möűšë ąćŧϊόņŝ ľîķє žøōmίйğ, ǻⁿđ мόřε !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!!
+- Ẁē'νё àðđέď đöžзńş öƒ śėŧťїńģš тб тнè ÛĮ ťħąт ŏņ¢з όⁿℓγ έжіѕŧéð іή тђε ЈŠΩŃ ƒїℓė, ĭňĉŀџđіņģ å ňэẅ φâģé ƒøя ςŭśŧŏmïżϊñģ тħέ ĺαŷöυτ öƒ убµř Йέẁ Ţàъ мęήµ! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Ẁè ĥаνė řэąřčħΐŧέсτέð щįлďοш мǻňαĝēмêиť ťô ϊmрябνé ŗĕŀĩāвîĺïтγ; ρŀěăѕе ƒíŀё αⁿу вûġš ÿøú εʼnćōùлťēѓ ẃïτħ ŧћё wt.exe ǻļĭâś !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! !!! 
+- Рґøƒíŀêŝ ňöẁ šћθẁ ãй ĭčöñ ίƒ ŧħэŷ'νę ъеєл ђіðδэñ őř řєƒěґ ŧσ φяοġгаmŝ ẅђíçĥ ẁ℮гέ џňϊйşťàľĺèð. !!! !!! !!! !!! !!! !!! !!! !!! !!! !
 
-Ρĺęąŝэ ѕєě õμя ĞĭтΗύв řєĺэдšέŝ рάġě ƒοґ àďđϊтїõлаℓ ðêţǻїłş. !!! !!! !!! !!! !!! !!!
+Рļèāŝє ŝèĕ θџŗ ĢίťĤцъ řέĺэªşэš ρąĝę ƒόř áďđїτϊōπαľ đэŧдįļŝ. !!! !!! !!! !!! !!! !!!
    </ReleaseNotes>
   <ScreenshotCaptions>
     <!-- Valid length: 200 character limit, up to 9 elements per platform -->

build/StoreSubmission/Stable/PDPs/ru-RU/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Версия __VERSION_NUMBER__
 
-– Новая страница расширений, на которой отображается информация о том, что было установлено в вашем терминале
-– Палитра команд теперь доступна на вашем языке, а также на английском
-– Новые функции VT, например синхронизированная отрисовка, новые цветовые схемы, настройка быстрых действий мыши, таких как масштабирование, и т. д.
+– Мы добавили в пользовательский интерфейс десятки параметров, которые ранее существовали только в JSON-файле, включая новую страницу для настройки макета меню новой вкладки.
+– Мы переработали управление окнами для повышения надежности. Сообщайте о любых ошибках, которые вы обнаружите с псевдонимом wt.exe
+– Профили теперь отображают значок, если они были скрыты или ссылаются на программы, которые были удалены.
 
 Дополнительные сведения см. на странице выпусков GitHub.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/sr-Cyrl-RS/PDP.xml

@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ProductDescription language="sr-cyrl-rs" xmlns="http://schemas.microsoft.com/appx/2012/ProductDescription" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xml:lang="en-us" Release="">
-  <AppStoreName _locID="App_AppStoreName">
-    <!-- This is optional.  AppStoreName is typically extracted from your package's AppxManifest DisplayName property. -->
-    <!-- Uncomment (and localize) this Store name if your application package does not contain a localization for the DisplayName in this language. -->
-    <!-- Leaving this uncommented for a language that your application package DOES contain a DisplayName for will result in a submission failure with the API. -->
-    <!-- _locComment_text="{MaxLength=200} App AppStoreName" -->
-    <!-- Windows Terminal -->
-  </AppStoreName>
-  <Keywords>
-    <!-- Valid length: 30 character limit, up to 7 elements -->
-    <Keyword _locID="App_keyword1">
-      <!-- _locComment_text="{MaxLength=30} App keyword 1" -->Терминал</Keyword>
-    <Keyword _locID="App_keyword2">
-      <!-- _locComment_text="{MaxLength=30} App keyword 2" -->Конзола</Keyword>
-    <Keyword _locID="App_keyword3">
-      <!-- _locComment_text="{MaxLength=30} App keyword 3" -->
-    </Keyword>
-    <Keyword _locID="App_keyword4">
-      <!-- _locComment_text="{MaxLength=30} App keyword 4" -->
-    </Keyword>
-    <Keyword _locID="App_keyword5">
-      <!-- _locComment_text="{MaxLength=30} App keyword 5" -->
-    </Keyword>
-    <Keyword _locID="App_keyword6">
-      <!-- _locComment_text="{MaxLength=30} App keyword 6" -->
-    </Keyword>
-    <Keyword _locID="App_keyword7">
-      <!-- _locComment_text="{MaxLength=30} App keyword 7" -->
-    </Keyword>
-  </Keywords>
-  <Description _locID="App_Description">
-    <!-- _locComment_text="{MaxLength=10000} App Description" -->Windows терминал је модерна, брза, ефикасна, моћна и продуктивна апликација терминала за кориснике алата из командне линије и љуски као што су Command Prompt, PowerShell, и WSL. Неке од његових главних функционалности су вишеструке картице, панели, подршка за Уникод и UTF-8, GPU убрзани механизам за исцртавање текста, произвољне теме, стилови и конфигурације.
-
-Ово је пројекат отвореног кода и учешће заједнице је добродошло. Ако желите да учествујете, молимо вас да посетите https://github.com/microsoft/terminal </Description>
-  <ShortDescription _locID="App_ShortDescription">
-    <!-- Only used for games. This description appears in the Information section of the Game Hub on Xbox One, and helps customers understand more about your game. -->
-    <!-- _locComment_text="{MaxLength=500} App ShortDescription" -->
-  </ShortDescription>
-  <ShortTitle _locID="App_ShortTitle">
-    <!-- A shorter version of your product's name. If provided, this shorter name may appear in various places on Xbox One (during installation, in Achievements, etc.) in place of the full title of your product. -->
-    <!-- _locComment_text="{MaxLength=50} App ShortTitle" -->
-  </ShortTitle>
-  <SortTitle _locID="App_SortTitle">
-    <!-- If your product could be alphabetized in different ways, you can enter another version here. This may help customers find the product more quickly when searching. -->
-    <!-- _locComment_text="{MaxLength=255} App SortTitle" -->
-  </SortTitle>
-  <VoiceTitle _locID="App_VoiceTitle">
-    <!-- An alternate name for your product that, if provided, may be used in the audio experience on Xbox One when using Kinect or a headset. -->
-    <!-- _locComment_text="{MaxLength=255} App VoiceTitle" -->
-  </VoiceTitle>
-  <DevStudio _locID="App_DevStudio">
-    <!-- Specify this value if you want to include a "Developed by" field in the listing. (The "Published by" field will list the publisher display name associated with your account, whether or not you provide a devStudio value.) -->
-    <!-- _locComment_text="{MaxLength=255} App DevStudio" -->
-  </DevStudio>
-  <ReleaseNotes _locID="App_ReleaseNotes">
-    <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Верзија __VERSION_NUMBER__
-
-- Попуно нова страница Проширења која приказује шта је све инсталирано у ваш Терминал
-- Палета команди се сада приказује и на вашем матерњем језику, као и на енглеском
-- Нове VT функционалности као што су синхронизовано исцртавање, нове шеме боја, конфигурација за брзе акције мишем, као што је зумирање, и још тога
-
-За више детаља, молимо вас да посетите нашу GitHub страницу издања.
-  </ReleaseNotes>
-  <ScreenshotCaptions>
-    <!-- Valid length: 200 character limit, up to 9 elements per platform -->
-    <!-- Valid attributes: any of DesktopImage, MobileImage, XboxImage, SurfaceHubImage, and HoloLensImage -->
-    <Caption DesktopImage="acrylic-emoji.png" _locID="App_caption1">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 1" -->
-    </Caption>
-    <Caption DesktopImage="panes.png" _locID="App_caption2">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 2" -->
-    </Caption>
-    <Caption DesktopImage="htop.png" _locID="App_caption3">
-      <!-- _locComment_text="{MaxLength=200} Screenshot caption 3" -->
-    </Caption>
-  </ScreenshotCaptions>
-  <AdditionalAssets>
-    <!-- Valid elements:-->
-    <!--   HeroImage414x180, HeroImage846x468, HeroImage558x756, HeroImage414x468, HeroImage558x558, HeroImage2400x1200,-->
-    <!--   ScreenshotWXGA, ScreenshotHD720, ScreenshotWVGA, Doublewide, Panoramic, Square,-->
-    <!--   SmallMobileTile, SmallXboxLiveTile, LargeMobileTile, LargeXboxLiveTile, Tile,-->
-    <!--   DesktopIcon, Icon (use this value for the 1:1 300x300 pixels logo), AchievementIcon,-->
-    <!--   ChallengePromoIcon, RewardDisplayIcon, Icon150X150, Icon71X71,-->
-    <!--   BoxArt, BrandedKeyArt, PosterArt, FeaturedPromotionalArt, PromotionalArt16x9, TitledHeroArt-->
-    <!-- There is no content for any of these elements, just a single attribute called FileName. -->
-    <PosterArt FileName="Store Poster Art.png" />
-    <BoxArt FileName="Store Box Art.png" />
-    <PromotionalArt16x9 FileName="Store Thumbnail.png" />
-  </AdditionalAssets>
-  <Trailers>
-    <!-- Maximum number of trailers permitted: 15 -->
-    <Trailer FileName="CC0605_CommandLine_Teaser_WEB_MASTER_H264_1080p_23.976_-16LKFS_-3dbTP_ST.mp4">
-      <Title _locID="App_trailerTitle1">
-        <!-- _locComment_text="{MaxLength=255} Trailer title 1" -->Нови Windows терминал</Title>
-      <Images>
-        <!-- Current maximum of 1 image per trailer permitted. -->
-        <Image FileName="Store Thumbnail.png">
-          <!-- _locComment_text="{Locked} Trailer screenshot 1 description" -->
-        </Image>
-      </Images>
-    </Trailer>
-  </Trailers>
-  <AppFeatures>
-    <!-- Valid length: 200 character limit, up to 20 elements -->
-    <AppFeature _locID="App_feature1">
-      <!-- _locComment_text="{MaxLength=200} App Feature 1" -->Вишеструке картице</AppFeature>
-    <AppFeature _locID="App_feature2">
-      <!-- _locComment_text="{MaxLength=200} App Feature 2" -->Пуна Уникод подршка</AppFeature>
-    <AppFeature _locID="App_feature3">
-      <!-- _locComment_text="{MaxLength=200} App Feature 3" -->GPU-убрзано исцртавање текста</AppFeature>
-    <AppFeature _locID="App_feature4">
-      <!-- _locComment_text="{MaxLength=200} App Feature 4" -->Потпуна прилагодљивост</AppFeature>
-    <AppFeature _locID="App_feature5">
-      <!-- _locComment_text="{MaxLength=200} App Feature 5" -->Подела панела</AppFeature>
-    <AppFeature _locID="App_feature6">
-      <!-- _locComment_text="{MaxLength=200} App Feature 6" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature7">
-      <!-- _locComment_text="{MaxLength=200} App Feature 7" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature8">
-      <!-- _locComment_text="{MaxLength=200} App Feature 8" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature9">
-      <!-- _locComment_text="{MaxLength=200} App Feature 9" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature10">
-      <!-- _locComment_text="{MaxLength=200} App Feature 10" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature11">
-      <!-- _locComment_text="{MaxLength=200} App Feature 11" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature12">
-      <!-- _locComment_text="{MaxLength=200} App Feature 12" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature13">
-      <!-- _locComment_text="{MaxLength=200} App Feature 13" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature14">
-      <!-- _locComment_text="{MaxLength=200} App Feature 14" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature15">
-      <!-- _locComment_text="{MaxLength=200} App Feature 15" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature16">
-      <!-- _locComment_text="{MaxLength=200} App Feature 16" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature17">
-      <!-- _locComment_text="{MaxLength=200} App Feature 17" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature18">
-      <!-- _locComment_text="{MaxLength=200} App Feature 18" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature19">
-      <!-- _locComment_text="{MaxLength=200} App Feature 19" -->
-    </AppFeature>
-    <AppFeature _locID="App_feature20">
-      <!-- _locComment_text="{MaxLength=200} App Feature 20" -->
-    </AppFeature>
-  </AppFeatures>
-  <RecommendedHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-    <Recommendation _locID="App_RecommendedHW1">
-      <!-- _locComment_text="{MaxLength=200} App Recommended Hardware 1" -->Тастатура</Recommendation>
-  </RecommendedHardware>
-  <MinimumHardware>
-    <!-- Valid length: 200 character limit, up to 11 elements -->
-  </MinimumHardware>
-  <CopyrightAndTrademark _locID="App_CopyrightandTrademark">
-    <!-- _locComment_text="{MaxLength=200} Copyright and Trademark" -->Copyright (c) Microsoft Corporation</CopyrightAndTrademark>
-  <AdditionalLicenseTerms _locID="App_AdditionalLicenseTerms">
-    <!-- _locComment_text="{MaxLength=10000} Additional License Terms" -->
-  </AdditionalLicenseTerms>
-  <WebsiteURL _locID="App_WebsiteURL">
-    <!-- _locComment_text="{MaxLength=2048} WebsiteURL" -->https://github.com/microsoft/terminal</WebsiteURL>
-  <SupportContactInfo _locID="App_SupportContactInfo">
-    <!-- _locComment_text="{MaxLength=2048} Support Contact Info" -->https://github.com/microsoft/terminal/issues/new</SupportContactInfo>
-  <PrivacyPolicyURL _locID="App_PrivacyURL">
-    <!-- _locComment_text="{MaxLength=2048} Privacy Policy URL" -->https://go.microsoft.com/fwlink/?LinkID=521839</PrivacyPolicyURL>
-</ProductDescription>

build/StoreSubmission/Stable/PDPs/uk-UA/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes _locID="App_ReleaseNotes">
     <!-- _locComment_text="{MaxLength=1500} {Locked=__VERSION_NUMBER__}{Locked=wt.exe} App Release Note" -->Версія __VERSION_NUMBER__
 
-- Цілком нова сторінка розширень, яка показує, що було встановлено у вашому Терміналі
-- Палітра команд тепер відображається вашою рідною мовою, так само, як і англійською
-- Нові VT функції, такі як синхронізований рендеринг, нові колірні схеми, налаштування для швидких дій миші, таких як масштабування, тощо
+- Ми додали десятки налаштувань до інтерфейсу користувача, які раніше існували лише у файлі JSON, включаючи нову сторінку для налаштування макета меню «Нова вкладка»!
+- Ми переробили архітектуру керування вікнами для підвищення надійності; будь ласка, повідомляйте про будь-які помилки, з якими ви зіткнулися, за допомогою псевдоніма wt.exe.
+- Профілі тепер відображають значок, якщо вони були приховані, або посилаються на програми, які було видалено.
 
 Будь ласка, перегляньте нашу сторінку релізів GitHub для отримання додаткової інформації.
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-CN/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 一个全新的“扩展”页，显示已安装到终端的内容
-- 命令面板现在以你的母语和英语显示
-- 新的 VT 功能，例如同步渲染、新配色方案、快速鼠标操作(如缩放)的配置等
+- 我们向用户界面添加了许多之前仅存在于 JSON 文件中的设置，包括用于自定义“新建标签页”菜单布局的新页面!
+- 我们已重新架构窗口管理以提高可靠性; 请使用 wt.exe 别名提交您遇到的任何错误
+- 配置文件如果已被隐藏或引用了已卸载的程序，现在会显示一个图标。
 
 有关其他详细信息，请参阅我们的 GitHub 发布页面。
   </ReleaseNotes>

build/StoreSubmission/Stable/PDPs/zh-TW/PDP.xml

@@ -56,9 +56,9 @@
   <ReleaseNotes>
     Version __VERSION_NUMBER__
 
-- 全新的延伸模組頁面會顯示已安裝在您終端機中的內容
-- 命令選擇區現在以您的母語和英文顯示
-- 新的 VT 功能，例如同步轉譯、新的色彩配置、快速滑鼠動作 (例如縮放) 設定等等
+- 我們已在使用者介面中新增數十個曾經僅存在於 JSON 檔案中的設定，包括一個可自訂新索引標籤選單版面配置的新頁面!
+- 我們已重新架構視窗管理以提升可靠性; 如果您在使用 wt.exe 別名時遇到任何錯誤，請提交錯誤回報
+- 如果設定檔已隱藏或參照已解除安裝的程式，現在會顯示圖示。
 
 如需更多詳細資料，請參閱我們的 GitHub 發行版本頁面。
   </ReleaseNotes>

build/pipelines/templates-v2/job-build-package-wpf.yml

@@ -46,7 +46,6 @@ jobs:
           BuildConfiguration: ${{ config }}
   dependsOn: ${{ parameters.dependsOn }}
   variables:
-    BuildPlatform: Any CPU
     OutputBuildPlatform: AnyCPU
     Terminal.BinDir: $(Build.SourcesDirectory)/bin/$(OutputBuildPlatform)/$(BuildConfiguration)
     JobOutputDirectory: $(Build.ArtifactStagingDirectory)\nupkg

custom.props

@@ -3,9 +3,9 @@
   <!-- This file is read by XES, which we use in our Release builds. -->
   <PropertyGroup Label="Version">
     <XesUseOneStoreVersioning>true</XesUseOneStoreVersioning>
-    <XesBaseYearForStoreVersion>2026</XesBaseYearForStoreVersion>
+    <XesBaseYearForStoreVersion>2025</XesBaseYearForStoreVersion>
     <VersionMajor>1</VersionMajor>
-    <VersionMinor>26</VersionMinor>
+    <VersionMinor>25</VersionMinor>
     <VersionInfoProductName>Windows Terminal</VersionInfoProductName>
     <VersionInfoCulture>1033</VersionInfoCulture>
     <!-- The default has a spacing problem -->

dep/vcpkg-overlay-ports/fmt/0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch

@@ -1,45 +0,0 @@
-From c3be070b7ee42639554555c27dce10c9de7af76c Mon Sep 17 00:00:00 2001
-From: "J. Berger" <mail@janaberger.de>
-Date: Sat, 1 Nov 2025 17:38:30 +0100
-Subject: [PATCH] When using MSVC x86 to compile v12.0.0 or v12.1.0,
- conversions from __int64 to a 32bit unsigned int trigger warnings. (#4594)
-
-This is a follow-up for PR #4572.
----
- include/fmt/format.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/fmt/format.h b/include/fmt/format.h
-index 4a653007..65e19d2d 100644
---- a/include/fmt/format.h
-+++ b/include/fmt/format.h
-@@ -2534,7 +2534,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-     auto grouping = Grouping(loc, specs.localized());
-     size += grouping.count_separators(exp);
-     return write_padded<Char, align::right>(
--        out, specs, to_unsigned(size), [&](iterator it) {
-+        out, specs, static_cast<size_t>(size), [&](iterator it) {
-           if (s != sign::none) *it++ = detail::getsign<Char>(s);
-           it = write_significand(it, f.significand, significand_size, exp,
-                                  decimal_point, grouping);
-@@ -2550,7 +2550,7 @@ FMT_CONSTEXPR20 auto write_fixed(OutputIt out, const DecimalFP& f,
-   bool pointy = num_zeros != 0 || significand_size != 0 || specs.alt();
-   size += 1 + (pointy ? 1 : 0) + num_zeros;
-   return write_padded<Char, align::right>(
--      out, specs, to_unsigned(size), [&](iterator it) {
-+      out, specs, static_cast<size_t>(size), [&](iterator it) {
-         if (s != sign::none) *it++ = detail::getsign<Char>(s);
-         *it++ = Char('0');
-         if (!pointy) return it;
-@@ -2594,7 +2594,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& f,
-     *it++ = Char(exp_char);
-     return write_exponent<Char>(exp, it);
-   };
--  auto usize = to_unsigned(size);
-+  size_t usize = static_cast<size_t>(size);
-   return specs.width > 0
-              ? write_padded<Char, align::right>(out, specs, usize, write)
-              : base_iterator(out, write(reserve(out, usize)));
--- 
-2.52.0.vfs.0.5
-

dep/vcpkg-overlay-ports/fmt/fix-write-batch.patch

@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88c12148..967b53dd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -260,7 +260,7 @@ if (FMT_MASTER_PROJECT AND CMAKE_GENERATOR MATCHES "Visual Studio")
+   join(netfxpath
+        "C:\\Program Files\\Reference Assemblies\\Microsoft\\Framework\\"
+        ".NETFramework\\v4.0")
+-  file(WRITE run-msbuild.bat "
++  file(WRITE "${CMAKE_BINARY_DIR}/run-msbuild.bat" "
+     ${MSBUILD_SETUP}
+     ${CMAKE_MAKE_PROGRAM} -p:FrameworkPathOverride=\"${netfxpath}\" %*")
+ endif ()

dep/vcpkg-overlay-ports/fmt/portfile.cmake

@@ -2,10 +2,10 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fmtlib/fmt
     REF "${VERSION}"
-    SHA512 f0da82c545b01692e9fd30fdfb613dbb8dd9716983dcd0ff19ac2a8d36f74beb5540ef38072fdecc1e34191b3682a8542ecbf3a61ef287dbba0a2679d4e023f2
+    SHA512 573b7de1bd224b7b1b60d44808a843db35d4bc4634f72a9edcb52cf68e99ca66c744fd5d5c97b4336ba70b94abdabac5fc253b245d0d5cd8bbe2a096bf941e39
     HEAD_REF master
     PATCHES
-        0001-When-using-MSVC-x86-to-compile-v12.0.0-or-v12.1.0-co.patch
+        fix-write-batch.patch
 )
 
 vcpkg_cmake_configure(
@@ -22,6 +22,13 @@ vcpkg_cmake_config_fixup()
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fmt/base.h"
+        "defined(FMT_SHARED)"
+        "1"
+    )
+endif()
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/share"

dep/vcpkg-overlay-ports/fmt/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "fmt",
-  "version": "12.1.0",
+  "version": "11.1.4",
   "description": "{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.",
   "homepage": "https://github.com/fmtlib/fmt",
   "license": "MIT",

dep/vcpkg-overlay-ports/jsoncpp/0001-No-trailing-space-for-BuildStyledStreamWriter.patch

@@ -1,57 +0,0 @@
-From fae5556fd4d4850f948aeabee25ddf0280494725 Mon Sep 17 00:00:00 2001
-From: lizz <lizz@sensetime.com>
-Date: Fri, 10 Apr 2020 23:02:21 +0800
-Subject: [PATCH] No trailing space for BuiltStyledStreamWriter
-
-Signed-off-by: lizz <lizz@sensetime.com>
----
- src/lib_json/json_writer.cpp | 10 +++++++++-
- src/test_lib_json/main.cpp   |  4 ++--
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/src/lib_json/json_writer.cpp b/src/lib_json/json_writer.cpp
-index ee45c43..e22eb17 100644
---- a/src/lib_json/json_writer.cpp
-+++ b/src/lib_json/json_writer.cpp
-@@ -990,7 +990,15 @@ void BuiltStyledStreamWriter::writeValue(Value const& value) {
-         writeCommentBeforeValue(childValue);
-         writeWithIndent(
-             valueToQuotedStringN(name.data(), name.length(), emitUTF8_));
--        *sout_ << colonSymbol_;
-+        size_t n = colonSymbol_.size();
-+        if ((childValue.type() == objectValue && !childValue.empty()) ||
-+            (childValue.type() == arrayValue && !childValue.empty() &&
-+             ((cs_ == CommentStyle::All) || isMultilineArray(childValue)))) {
-+          // Line-ending colon, so trim any trailing space from it
-+          for (; n && colonSymbol_[n - 1] == ' '; --n)
-+            ;
-+        }
-+        sout_->write(colonSymbol_.data(), n);
-         writeValue(childValue);
-         if (++it == members.end()) {
-           writeCommentAfterValueOnSameLine(childValue);
-diff --git a/src/test_lib_json/main.cpp b/src/test_lib_json/main.cpp
-index 55ab224..28cb043 100644
---- a/src/test_lib_json/main.cpp
-+++ b/src/test_lib_json/main.cpp
-@@ -2533,7 +2533,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNumericValue) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
--                              "\t\"property1\" : \n"
-+                              "\t\"property1\" :\n"
-                               "\t[\n"
-                               "\t\t\"value1\",\n"
-                               "\t\t\"value2\"\n"
-@@ -2553,7 +2553,7 @@ JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeArrays) {
- JSONTEST_FIXTURE_LOCAL(StreamWriterTest, writeNestedObjects) {
-   Json::StreamWriterBuilder writer;
-   const Json::String expected("{\n"
--                              "\t\"object1\" : \n"
-+                              "\t\"object1\" :\n"
-                               "\t{\n"
-                               "\t\t\"bool\" : true,\n"
-                               "\t\t\"nested\" : 123\n"
--- 
-2.52.0.vfs.0.5
-

dep/vcpkg-overlay-ports/jsoncpp/portfile.cmake

@@ -1,36 +0,0 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO open-source-parsers/jsoncpp
-    REF "${VERSION}"
-    SHA512 006d81f9f723dcfe875ebc2147449c07c5246bf97dd7b9eee1909decc914b051d6f3f06feb5c3dfa143d28773fb310aabb04a81dc447cc61513309df8eba8b08
-    HEAD_REF master
-    PATCHES
-        0001-No-trailing-space-for-BuildStyledStreamWriter.patch
-)
-
-string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" JSONCPP_STATIC)
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DJSONCPP_WITH_CMAKE_PACKAGE=ON
-        -DBUILD_STATIC_LIBS=${JSONCPP_STATIC}
-        -DJSONCPP_STATIC_WINDOWS_RUNTIME=${STATIC_CRT}
-        -DJSONCPP_WITH_PKGCONFIG_SUPPORT=ON
-        -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
-        -DJSONCPP_WITH_TESTS=OFF
-        -DJSONCPP_WITH_EXAMPLE=OFF
-        -DBUILD_OBJECT_LIBS=OFF
-)
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/jsoncpp)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-vcpkg_copy_pdbs()
-vcpkg_fixup_pkgconfig()
-
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

dep/vcpkg-overlay-ports/jsoncpp/vcpkg.json

@@ -1,17 +0,0 @@
-{
-  "name": "jsoncpp",
-  "version": "1.9.6",
-  "description": "JsonCpp is a C++ library that allows manipulating JSON values, including serialization and deserialization to and from strings. It can also preserve existing comment in unserialization/serialization steps, making it a convenient format to store user input files.",
-  "homepage": "https://github.com/open-source-parsers/jsoncpp",
-  "license": "MIT",
-  "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
-  ]
-}

doc/cascadia/profiles.schema.json

@@ -2407,14 +2407,6 @@
             "console"
           ]
         },
-        "compatibility.ambiguousWidth": {
-          "default": "narrow",
-          "description": "Controls the cell width of East Asian Ambiguous characters.",
-          "enum": [
-            "narrow",
-            "wide"
-          ]
-        },
         "copyFormatting": {
           "default": true,
           "description": "When set to `true`, the color and font formatting of selected text is also copied to your clipboard. When set to `false`, only plain text is copied to your clipboard. An array of specific formats can also be used. Supported array values include `html` and `rtf`. Plain text is always copied.",

src/buffer/out/UTextAdapter.cpp

@@ -390,9 +390,6 @@ Microsoft::Console::ICU::unique_utext Microsoft::Console::ICU::UTextFromTextBuff
     utext_setup(&ut, 0, &status);
     FAIL_FAST_IF(status > U_ZERO_ERROR);
 
-    rowBeg = std::max<til::CoordType>(0, rowBeg);
-    rowEnd = std::min(textBuffer.GetSize().BottomExclusive(), rowEnd);
-
     ut.providerProperties = (1 << UTEXT_PROVIDER_LENGTH_IS_EXPENSIVE) | (1 << UTEXT_PROVIDER_STABLE_CHUNKS);
     ut.pFuncs = &utextFuncs;
     ut.context = &textBuffer;

src/buffer/out/ut_textbuffer/ReflowTests.cpp

@@ -604,8 +604,8 @@ namespace
 
 extern "C" HRESULT __declspec(dllexport) __cdecl ReflowTestDataSource(IDataSource** ppDataSource, void*)
 {
-    auto source{ Microsoft::WRL::Make<ArrayIndexTaefAdapterSource>() };
-    return source.CopyTo(ppDataSource);
+    *ppDataSource = new ArrayIndexTaefAdapterSource>(std::size(testCases));
+    return S_OK;
 }
 
 class ReflowTests

src/cascadia/TerminalApp/AppActionHandlers.cpp

@@ -550,7 +550,7 @@ namespace winrt::TerminalApp::implementation
         if (const auto& realArgs = args.ActionArgs().try_as<CopyTextArgs>())
         {
             const auto copyFormatting = realArgs.CopyFormatting();
-            const auto format = copyFormatting ? copyFormatting.Value() : _currentWindowSettings().CopyFormatting();
+            const auto format = copyFormatting ? copyFormatting.Value() : _settings.GlobalSettings().CopyFormatting();
             const auto handled = _CopyText(realArgs.DismissSelection(), realArgs.SingleLine(), realArgs.WithControlSequences(), format);
             args.Handled(handled);
         }

src/cascadia/TerminalApp/CommandPalette.cpp

@@ -928,17 +928,6 @@ namespace winrt::TerminalApp::implementation
     void CommandPalette::_filterTextChanged(const IInspectable& /*sender*/,
                                             const Windows::UI::Xaml::RoutedEventArgs& /*args*/)
     {
-        // GH#18737: Only respond to this change if we are visible:
-        // _close calls _searchBox().Text(L"") to reset the search text, which lands us
-        // in here after the command palette is dismissed. Since we have a code path here that
-        // could potentially lead to an action being previewed (specifically if there is a
-        // preview-able action as the first entry in the command list), that preview will
-        // appear after the palette is dismissed without this check.
-        if (Visibility() != Visibility::Visible)
-        {
-            return;
-        }
-
         // When we are executing the _SelectNextTab in the TabManagement.cpp, this method
         // is getting triggered because we set up the default value for that CommandPalette
         // with an empty string. Therefore, to avoid the reset of the index when executing

src/cascadia/TerminalApp/Resources/sr-Cyrl-RS/Resources.resw

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="InitialJsonParseErrorText" xml:space="preserve">
-    <value>Подешавања нису могла да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
+    <value>Подешавања нису могла да се учитау из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
   </data>
   <data name="MissingDefaultProfileText" xml:space="preserve">
     <value>У листи профила није могао да се пронађе ваш подразумевани профил - користи се први профил. Проверите да ли се "defaultProfile" подудара са GUID неког од ваших профила.</value>
@@ -141,7 +141,7 @@
     <value>Подешавања нису могла поново да се учитају из фајла. Проверите има ли синтаксних грешака, укључујући запете на крају реда.</value>
   </data>
   <data name="UsingDefaultSettingsText" xml:space="preserve">
-    <value>Привремено се користе подразумевана подешавања апликације Windows Терминал.</value>
+    <value>Привремено се користе подразумевана подешавања Windows Терминала.</value>
   </data>
   <data name="InitialJsonParseErrorTitle" xml:space="preserve">
     <value>Није успело учитавање подешавања</value>
@@ -149,6 +149,12 @@
   <data name="SettingsValidateErrorTitle" xml:space="preserve">
     <value>Наишло се на грешке током учитавања корисничких подешавања</value>
   </data>
+  <data name="KeyboardServiceDisabledDialog.PrimaryButtonText" xml:space="preserve">
+    <value>ОК</value>
+  </data>
+  <data name="KeyboardServiceDisabledDialog.Title" xml:space="preserve">
+    <value>Упозорење:</value>
+  </data>
   <data name="KeyboardServiceWarningText" xml:space="preserve">
     <value>„{0}” се не извршава на вашој машини. Због тога Терминал можда неће моћи да прима улаз са тастатуре.</value>
     <comment>{0} will be replaced with the OS-localized name of the TabletInputService</comment>
@@ -159,12 +165,28 @@
   <data name="ReloadJsonParseErrorTitle" xml:space="preserve">
     <value>Није успело поновно учитавање подешавања</value>
   </data>
+  <data name="FeedbackUriValue" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2125419</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
   <data name="AboutMenuItem" xml:space="preserve">
     <value>О програму</value>
   </data>
+  <data name="FeedbackMenuItem" xml:space="preserve">
+    <value>Повратне информације</value>
+  </data>
   <data name="SettingsMenuItem" xml:space="preserve">
     <value>Подешавања</value>
   </data>
+  <data name="Cancel" xml:space="preserve">
+    <value>Откажи</value>
+  </data>
+  <data name="CloseAll" xml:space="preserve">
+    <value>Затвори све</value>
+  </data>
+  <data name="Quit" xml:space="preserve">
+    <value>Напусти</value>
+  </data>
   <data name="MultiplePanes" xml:space="preserve">
     <value>Више панела</value>
   </data>
@@ -271,6 +293,17 @@
     <value>• Наведена "theme" није пронађена у листи тема. Привремено се употребљава подразумевана вредност.</value>
     <comment>{Locked="•"} This glyph is a bullet, used in a bulleted list.</comment>
   </data>
+  <data name="LegacyGlobalsProperty" xml:space="preserve">
+    <value>Особина "globals" је застарела - ваша подешавања би требало да се ажурирају. </value>
+    <comment>{Locked="\"globals\""} </comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefUrl" xml:space="preserve">
+    <value>https://go.microsoft.com/fwlink/?linkid=2128258</value>
+    <comment>{Locked}This is a FWLink, so it will be localized with the fwlink tool</comment>
+  </data>
+  <data name="LegacyGlobalsPropertyHrefLabel" xml:space="preserve">
+    <value>За више информација, погледајте следећу веб страницу.</value>
+  </data>
   <data name="FailedToParseCommandJson" xml:space="preserve">
     <value>Није успело развијање команде којој је постављено "iterateOn". Ова команда ће се игнорисати.</value>
     <comment>{Locked="\"iterateOn\""} </comment>
@@ -451,12 +484,21 @@
   <data name="ElevatedRun.Text" xml:space="preserve">
     <value>Ctrl+Клик да отворите као администратор</value>
   </data>
+  <data name="WindowCloseButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Затвори</value>
+  </data>
   <data name="WindowCloseButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Затвори</value>
   </data>
   <data name="WindowCloseButtonToolTip.Text" xml:space="preserve">
     <value>Затвори</value>
   </data>
+  <data name="WindowMaximizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Увећај</value>
+  </data>
+  <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
+    <value>Умањи</value>
+  </data>
   <data name="WindowMinimizeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
     <value>Умањи</value>
   </data>
@@ -476,6 +518,10 @@
     <value>Верзија:</value>
     <comment>This is the heading for a version number label</comment>
   </data>
+  <data name="AboutDialog_GettingStartedLink.Content" xml:space="preserve">
+    <value>Брзи почетак</value>
+    <comment>A hyperlink name for a guide on how to get started using Terminal</comment>
+  </data>
   <data name="AboutDialog_SourceCodeLink.Content" xml:space="preserve">
     <value>Изворни кôд</value>
     <comment>A hyperlink name for the Terminal's documentation</comment>
@@ -554,7 +600,7 @@
     <value>Откуцајте име команде...</value>
   </data>
   <data name="CommandPalette_NoMatchesText.Text" xml:space="preserve">
-    <value>Ниједна команда се не подудара</value>
+    <value>Нема команди које се подударају</value>
   </data>
   <data name="CommandPaletteModeAnnouncement_ActionMode" xml:space="preserve">
     <value>Акција режим претраге</value>
@@ -751,9 +797,18 @@
   <data name="ExportTabText" xml:space="preserve">
     <value>Извези текст</value>
   </data>
+  <data name="ExportFailure" xml:space="preserve">
+    <value>Није успео извоз садржаја терминала</value>
+  </data>
+  <data name="ExportSuccess" xml:space="preserve">
+    <value>Успешно је извезен садржај терминала</value>
+  </data>
   <data name="FindText" xml:space="preserve">
     <value>Пронађи</value>
   </data>
+  <data name="PlainText" xml:space="preserve">
+    <value>Чисти текст</value>
+  </data>
   <data name="CloseOnExitInfoBar.Message" xml:space="preserve">
     <value>Понашање при прекиду извршавања може да се подеси у напредним подешавањима профила.</value>
   </data>
@@ -859,6 +914,10 @@
     <value>Картица "{0}" је премештена на позицију "{1}"</value>
     <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful tab movement. {0} is the name of the tab. {1} is the new tab index in the tab row.</comment>
   </data>
+  <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow" xml:space="preserve">
+    <value>Активни панел је премештен у картицу "{0}" у прозору "{1}"</value>
+    <comment>{Locked="{0}"}{Locked="{1}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the tab the pane was moved to. {1} is the name of the window the pane was moved to. Replaced in 1.19 by TerminalPage_PaneMovedAnnouncement_ExistingWindow2</comment>
+  </data>
   <data name="TerminalPage_PaneMovedAnnouncement_ExistingWindow2" xml:space="preserve">
     <value>Активни панел је премештен у прозор "{0}"</value>
     <comment>{Locked="{0}"}This text is read out by screen readers upon a successful pane movement. {0} is the name of the window the pane was moved to.</comment>

src/cascadia/TerminalApp/Tab.cpp

@@ -1114,7 +1114,7 @@ namespace winrt::TerminalApp::implementation
             [dispatcher, weakThis](auto&&, auto&&) -> safe_void_coroutine {
                 const auto weakThisCopy = weakThis;
                 co_await wil::resume_foreground(dispatcher);
-                if (auto tab{ weakThisCopy.get() })
+                if (auto tab{ weakThis.get() })
                 {
                     tab->_RecalculateAndApplyReadOnly();
                 }

src/cascadia/TerminalApp/TabManagement.cpp

@@ -105,7 +105,7 @@ namespace winrt::TerminalApp::implementation
         if (insertPosition == -1)
         {
             insertPosition = _tabs.Size();
-            if (_currentWindowSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
+            if (_settings.GlobalSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
             {
                 auto currentTabIndex = _GetFocusedTabIndex();
                 if (currentTabIndex.has_value())
@@ -220,7 +220,7 @@ namespace winrt::TerminalApp::implementation
         if (const auto content{ tab.GetActiveContent() })
         {
             const auto& icon{ content.Icon() };
-            const auto theme = _currentWindowSettings().CurrentTheme();
+            const auto theme = _settings.GlobalSettings().CurrentTheme();
             const auto iconStyle = (theme && theme.Tab()) ? theme.Tab().IconStyle() : IconStyle::Default;
 
             tab.UpdateIcon(icon, iconStyle);
@@ -231,7 +231,7 @@ namespace winrt::TerminalApp::implementation
     // - Handle changes to the tab width set by the user
     void TerminalPage::_UpdateTabWidthMode()
     {
-        _tabView.TabWidthMode(_currentWindowSettings().TabWidthMode());
+        _tabView.TabWidthMode(_settings.GlobalSettings().TabWidthMode());
     }
 
     // Method Description:
@@ -244,9 +244,9 @@ namespace winrt::TerminalApp::implementation
         // - there is more than one tab, or the user has chosen to always show tabs
         const auto isVisible = !_isInFocusMode &&
                                (!_isFullscreen || _showTabsFullscreen) &&
-                               (_currentWindowSettings().ShowTabsInTitlebar() ||
+                               (_settings.GlobalSettings().ShowTabsInTitlebar() ||
                                 (_tabs.Size() > 1) ||
-                                _currentWindowSettings().AlwaysShowTabs());
+                                _settings.GlobalSettings().AlwaysShowTabs());
 
         if (_tabView)
         {
@@ -286,7 +286,7 @@ namespace winrt::TerminalApp::implementation
             // current control's live settings (which will include changes
             // made through VT).
             uint32_t insertPosition = _tabs.Size();
-            if (_currentWindowSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
+            if (_settings.GlobalSettings().NewTabPosition() == NewTabPosition::AfterCurrentTab)
             {
                 insertPosition = tab.TabViewIndex() + 1;
             }
@@ -477,7 +477,7 @@ namespace winrt::TerminalApp::implementation
             // 1. We want to customize this behavior (e.g., use MRU logic)
             // 2. In fullscreen (GH#5799) and focus (GH#7916) modes the _OnTabItemsChanged is not fired
             // 3. When rearranging tabs (GH#7916) _OnTabItemsChanged is suppressed
-            const auto tabSwitchMode = _currentWindowSettings().TabSwitcherMode();
+            const auto tabSwitchMode = _settings.GlobalSettings().TabSwitcherMode();
 
             if (tabSwitchMode == TabSwitcherMode::MostRecentlyUsed)
             {
@@ -528,7 +528,7 @@ namespace winrt::TerminalApp::implementation
     void TerminalPage::_SelectNextTab(const bool bMoveRight, const Windows::Foundation::IReference<Microsoft::Terminal::Settings::Model::TabSwitcherMode>& customTabSwitcherMode)
     {
         const auto index{ _GetFocusedTabIndex().value_or(0) };
-        const auto tabSwitchMode = customTabSwitcherMode ? customTabSwitcherMode.Value() : _currentWindowSettings().TabSwitcherMode();
+        const auto tabSwitchMode = customTabSwitcherMode ? customTabSwitcherMode.Value() : _settings.GlobalSettings().TabSwitcherMode();
         if (tabSwitchMode == TabSwitcherMode::Disabled)
         {
             auto tabCount = _tabs.Size();
@@ -1017,7 +1017,7 @@ namespace winrt::TerminalApp::implementation
 
     void TerminalPage::_UpdateBackground(const winrt::Microsoft::Terminal::Settings::Model::Profile& profile)
     {
-        if (profile && _currentWindowSettings().UseBackgroundImageForWindow())
+        if (profile && _settings.GlobalSettings().UseBackgroundImageForWindow())
         {
             _SetBackgroundImage(profile.DefaultAppearance());
         }

src/cascadia/TerminalApp/TerminalAppLib.vcxproj

@@ -134,7 +134,7 @@
     </ClInclude>
     <ClInclude Include="FilteredCommand.h" />
     <ClInclude Include="Pane.h" />
-    <ClInclude Include="../fzf/fzf.h" />
+    <ClInclude Include="fzf/fzf.h" />
     <ClInclude Include="pch.h" />
     <ClInclude Include="ShortcutActionDispatch.h">
       <DependentUpon>ShortcutActionDispatch.idl</DependentUpon>
@@ -204,7 +204,7 @@
     <ClCompile Include="Tab.cpp">
       <DependentUpon>Tab.idl</DependentUpon>
     </ClCompile>
-    <ClCompile Include="../fzf/fzf.cpp" />
+    <ClCompile Include="fzf/fzf.cpp" />
     <ClCompile Include="TaskbarState.cpp">
       <DependentUpon>TaskbarState.idl</DependentUpon>
     </ClCompile>

src/cascadia/TerminalApp/TerminalPage.cpp

@@ -38,6 +38,7 @@ using namespace winrt::Microsoft::Terminal;
 using namespace winrt::Windows::ApplicationModel::DataTransfer;
 using namespace winrt::Windows::Foundation::Collections;
 using namespace winrt::Windows::System;
+using namespace winrt::Windows::System;
 using namespace winrt::Windows::UI;
 using namespace winrt::Windows::UI::Core;
 using namespace winrt::Windows::UI::Text;
@@ -226,13 +227,6 @@ namespace winrt::TerminalApp::implementation
         _WindowProperties.PropertyChanged({ get_weak(), &TerminalPage::_windowPropertyChanged });
     }
 
-    // Today this returns the same GlobalAppSettings object. A follow-up
-    // change will replace it with a real per-window settings type.
-    GlobalAppSettings TerminalPage::_currentWindowSettings() const
-    {
-        return _settings.WindowSettingsDefaults();
-    }
-
     // Method Description:
     // - implements the IInitializeWithWindow interface from shobjidl_core.
     // - We're going to use this HWND as the owner for the ConPTY windows, via
@@ -342,7 +336,7 @@ namespace winrt::TerminalApp::implementation
         auto tabRowImpl = winrt::get_self<implementation::TabRowControl>(_tabRow);
         _newTabButton = tabRowImpl->NewTabButton();
 
-        if (_currentWindowSettings().ShowTabsInTitlebar())
+        if (_settings.GlobalSettings().ShowTabsInTitlebar())
         {
             // Remove the TabView from the page. We'll hang on to it, we need to
             // put it in the titlebar.
@@ -377,7 +371,7 @@ namespace winrt::TerminalApp::implementation
 
         // Initialize the state of the CloseButtonOverlayMode property of
         // our TabView, to match the tab.showCloseButton property in the theme.
-        if (const auto theme = _currentWindowSettings().CurrentTheme())
+        if (const auto theme = _settings.GlobalSettings().CurrentTheme())
         {
             const auto visibility = theme.Tab() ? theme.Tab().ShowCloseButton() : Settings::Model::TabCloseButtonVisibility::Always;
 
@@ -432,7 +426,7 @@ namespace winrt::TerminalApp::implementation
         // Settings AllowDependentAnimations will affect whether animations are
         // enabled application-wide, so we don't need to check it each time we
         // want to create an animation.
-        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_currentWindowSettings().DisableAnimations());
+        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_settings.GlobalSettings().DisableAnimations());
 
         // Once the page is actually laid out on the screen, trigger all our
         // startup actions. Things like Panes need to know at least how big the
@@ -441,14 +435,14 @@ namespace winrt::TerminalApp::implementation
         // _OnFirstLayout will remove this handler so it doesn't get called more than once.
         _layoutUpdatedRevoker = _tabContent.LayoutUpdated(winrt::auto_revoke, { this, &TerminalPage::_OnFirstLayout });
 
-        _isAlwaysOnTop = _currentWindowSettings().AlwaysOnTop();
-        _showTabsFullscreen = _currentWindowSettings().ShowTabsFullscreen();
+        _isAlwaysOnTop = _settings.GlobalSettings().AlwaysOnTop();
+        _showTabsFullscreen = _settings.GlobalSettings().ShowTabsFullscreen();
 
         // DON'T set up Toasts/TeachingTips here. They should be loaded and
         // initialized the first time they're opened, in whatever method opens
         // them.
 
-        _tabRow.ShowElevationShield(IsRunningElevated() && _currentWindowSettings().ShowAdminShield());
+        _tabRow.ShowElevationShield(IsRunningElevated() && _settings.GlobalSettings().ShowAdminShield());
 
         _adjustProcessPriorityThrottled = std::make_shared<ThrottledFunc<>>(
             DispatcherQueue::GetForCurrentThread(),
@@ -958,7 +952,7 @@ namespace winrt::TerminalApp::implementation
         // Create profile entries from the NewTabMenu configuration using a
         // recursive helper function. This returns a std::vector of FlyoutItemBases,
         // that we then add to our Flyout.
-        auto entries = _currentWindowSettings().NewTabMenu();
+        auto entries = _settings.GlobalSettings().NewTabMenu();
         auto items = _CreateNewTabFlyoutItems(entries);
         for (const auto& item : items)
         {
@@ -1240,7 +1234,7 @@ namespace winrt::TerminalApp::implementation
             profileMenuItem.Icon(icon);
         }
 
-        if (profile.Guid() == _currentWindowSettings().DefaultProfile())
+        if (profile.Guid() == _settings.GlobalSettings().DefaultProfile())
         {
             // Contrast the default profile with others in font weight.
             profileMenuItem.FontWeight(FontWeights::Bold());
@@ -1477,7 +1471,7 @@ namespace winrt::TerminalApp::implementation
                                                                                         const bool inheritCursor)
     {
         static const auto textMeasurement = [&]() -> std::wstring_view {
-            switch (_currentWindowSettings().TextMeasurement())
+            switch (_settings.GlobalSettings().TextMeasurement())
             {
             case TextMeasurement::Graphemes:
                 return L"graphemes";
@@ -1489,9 +1483,6 @@ namespace winrt::TerminalApp::implementation
                 return {};
             }
         }();
-        static const auto ambiguousIsWide = [&]() -> bool {
-            return _currentWindowSettings().AmbiguousWidth() == AmbiguousWidth::Wide;
-        }();
 
         TerminalConnection::ITerminalConnection connection{ nullptr };
 
@@ -1557,10 +1548,6 @@ namespace winrt::TerminalApp::implementation
         {
             valueSet.Insert(L"textMeasurement", Windows::Foundation::PropertyValue::CreateString(textMeasurement));
         }
-        if (ambiguousIsWide)
-        {
-            valueSet.Insert(L"ambiguousIsWide", Windows::Foundation::PropertyValue::CreateBoolean(true));
-        }
 
         if (const auto id = settings.SessionId(); id != winrt::guid{})
         {
@@ -2320,7 +2307,7 @@ namespace winrt::TerminalApp::implementation
     safe_void_coroutine TerminalPage::CloseWindow()
     {
         if (_HasMultipleTabs() &&
-            _currentWindowSettings().ConfirmCloseAllTabs() &&
+            _settings.GlobalSettings().ConfirmCloseAllTabs() &&
             !_displayingCloseDialog)
         {
             if (_newTabButton && _newTabButton.Flyout())
@@ -2845,7 +2832,7 @@ namespace winrt::TerminalApp::implementation
     // - the title of the focused control if there is one, else "Terminal"
     hstring TerminalPage::Title()
     {
-        if (_currentWindowSettings().ShowTitleInTitlebar())
+        if (_settings.GlobalSettings().ShowTitleInTitlebar())
         {
             if (const auto tab{ _GetFocusedTab() })
             {
@@ -2934,7 +2921,7 @@ namespace winrt::TerminalApp::implementation
     // - See Pane::CalcSnappedDimension
     float TerminalPage::CalcSnappedDimension(const bool widthOrHeight, const float dimension) const
     {
-        if (_settings && _currentWindowSettings().SnapToGridOnResize())
+        if (_settings && _settings.GlobalSettings().SnapToGridOnResize())
         {
             if (const auto tabImpl{ _GetFocusedTabImpl() })
             {
@@ -2955,16 +2942,15 @@ namespace winrt::TerminalApp::implementation
     // - Does some of this in a background thread, as to not hang/crash the UI thread.
     // Arguments:
     // - eventArgs: the PasteFromClipboard event sent from the TermControl
-    safe_void_coroutine TerminalPage::_PasteFromClipboardHandler(const IInspectable sender, const PasteFromClipboardEventArgs eventArgs)
+    safe_void_coroutine TerminalPage::_PasteFromClipboardHandler(const IInspectable /*sender*/, const PasteFromClipboardEventArgs eventArgs)
     try
     {
         // The old Win32 clipboard API as used below is somewhere in the order of 300-1000x faster than
         // the WinRT one on average, depending on CPU load. Don't use the WinRT clipboard API if you can.
         const auto weakThis = get_weak();
         const auto dispatcher = Dispatcher();
-        const auto globalSettings = _currentWindowSettings();
+        const auto globalSettings = _settings.GlobalSettings();
         const auto bracketedPaste = eventArgs.BracketedPasteEnabled();
-        const auto sourceId = sender.try_as<ControlInteractivity>().Id();
 
         // GetClipboardData might block for up to 30s for delay-rendered contents.
         co_await winrt::resume_background();
@@ -3062,30 +3048,7 @@ namespace winrt::TerminalApp::implementation
         // This will end up calling ConptyConnection::WriteInput which calls WriteFile which may block for
         // an indefinite amount of time. Avoid freezes and deadlocks by running this on a background thread.
         assert(!dispatcher.HasThreadAccess());
-        eventArgs.HandleClipboardData(text);
-
-        // GH#18821: If broadcast input is active, paste the same text into all other
-        // panes on the tab. We do this here (rather than re-reading the
-        // clipboard per-pane) so that only one paste warning is shown.
-        co_await wil::resume_foreground(dispatcher);
-        if (const auto strongThis = weakThis.get())
-        {
-            if (const auto& tab{ strongThis->_GetFocusedTabImpl() })
-            {
-                if (tab->TabStatus().IsInputBroadcastActive())
-                {
-                    tab->GetRootPane()->WalkTree([&](auto&& pane) {
-                        if (const auto control = pane->GetTerminalControl())
-                        {
-                            if (control.ContentId() != sourceId && !control.ReadOnly())
-                            {
-                                control.RawWriteString(text);
-                            }
-                        }
-                    });
-                }
-            }
-        }
+        eventArgs.HandleClipboardData(std::move(text));
     }
     CATCH_LOG();
 
@@ -3395,6 +3358,24 @@ namespace winrt::TerminalApp::implementation
     // - Paste text from the Windows Clipboard to the focused terminal
     void TerminalPage::_PasteText()
     {
+        // First, check if we're in broadcast input mode. If so, let's tell all
+        // the controls to paste.
+        if (const auto& tab{ _GetFocusedTabImpl() })
+        {
+            if (tab->TabStatus().IsInputBroadcastActive())
+            {
+                tab->GetRootPane()->WalkTree([](auto&& pane) {
+                    if (auto control = pane->GetTerminalControl())
+                    {
+                        control.PasteTextFromClipboard();
+                    }
+                });
+                return;
+            }
+        }
+
+        // The focused tab wasn't in broadcast mode. No matter. Just ask the
+        // current one to paste.
         if (const auto& control{ _GetActiveControl() })
         {
             control.PasteTextFromClipboard();
@@ -3763,7 +3744,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_SetBackgroundImage(const winrt::Microsoft::Terminal::Settings::Model::IAppearanceConfig& newAppearance)
     {
-        if (!_currentWindowSettings().UseBackgroundImageForWindow())
+        if (!_settings.GlobalSettings().UseBackgroundImageForWindow())
         {
             _tabContent.Background(nullptr);
             return;
@@ -3872,17 +3853,17 @@ namespace winrt::TerminalApp::implementation
         // Reload the current value of alwaysOnTop from the settings file. This
         // will let the user hot-reload this setting, but any runtime changes to
         // the alwaysOnTop setting will be lost.
-        _isAlwaysOnTop = _currentWindowSettings().AlwaysOnTop();
+        _isAlwaysOnTop = _settings.GlobalSettings().AlwaysOnTop();
         AlwaysOnTopChanged.raise(*this, nullptr);
 
-        _showTabsFullscreen = _currentWindowSettings().ShowTabsFullscreen();
+        _showTabsFullscreen = _settings.GlobalSettings().ShowTabsFullscreen();
 
         // Settings AllowDependentAnimations will affect whether animations are
         // enabled application-wide, so we don't need to check it each time we
         // want to create an animation.
-        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_currentWindowSettings().DisableAnimations());
+        WUX::Media::Animation::Timeline::AllowDependentAnimations(!_settings.GlobalSettings().DisableAnimations());
 
-        _tabRow.ShowElevationShield(IsRunningElevated() && _currentWindowSettings().ShowAdminShield());
+        _tabRow.ShowElevationShield(IsRunningElevated() && _settings.GlobalSettings().ShowAdminShield());
 
         Media::SolidColorBrush transparent{ Windows::UI::Colors::Transparent() };
         _tabView.Background(transparent);
@@ -3903,7 +3884,7 @@ namespace winrt::TerminalApp::implementation
         // our TabView, to match the tab.showCloseButton property in the theme.
         //
         // Also update every tab's individual IsClosable to match the same property.
-        const auto theme = _currentWindowSettings().CurrentTheme();
+        const auto theme = _settings.GlobalSettings().CurrentTheme();
         const auto visibility = (theme && theme.Tab()) ?
                                     theme.Tab().ShowCloseButton() :
                                     Settings::Model::TabCloseButtonVisibility::Always;
@@ -4111,12 +4092,12 @@ namespace winrt::TerminalApp::implementation
     {
         constexpr auto lightnessThreshold = 0.6f;
         // TODO GH#3327: Look at what to do with the tab button when we have XAML theming
-        const auto isBrightColor = ColorFix::GetLightness(color) >= lightnessThreshold;
+        const auto IsBrightColor = ColorFix::GetLightness(color) >= lightnessThreshold;
         const auto isLightAccentColor = ColorFix::GetLightness(accentColor) >= lightnessThreshold;
         const auto hoverColorAdjustment = isLightAccentColor ? -0.05f : 0.05f;
         const auto pressedColorAdjustment = isLightAccentColor ? -0.1f : 0.1f;
 
-        const auto foregroundColor = isBrightColor ? Colors::Black() : Colors::White();
+        const auto foregroundColor = IsBrightColor ? Colors::Black() : Colors::White();
         const auto hoverColor = til::color{ ColorFix::AdjustLightness(accentColor, hoverColorAdjustment) };
         const auto pressedColor = til::color{ ColorFix::AdjustLightness(accentColor, pressedColorAdjustment) };
 
@@ -4517,7 +4498,7 @@ namespace winrt::TerminalApp::implementation
     // - <none>
     void TerminalPage::_UpdateTeachingTipTheme(winrt::Windows::UI::Xaml::FrameworkElement element)
     {
-        auto theme{ _currentWindowSettings().CurrentTheme() };
+        auto theme{ _settings.GlobalSettings().CurrentTheme() };
         auto requestedTheme{ theme.RequestedTheme() };
         while (element)
         {
@@ -4670,7 +4651,7 @@ namespace winrt::TerminalApp::implementation
     {
         if (profile == _settings.ProfileDefaults())
         {
-            return _settings.FindProfile(_currentWindowSettings().DefaultProfile());
+            return _settings.FindProfile(_settings.GlobalSettings().DefaultProfile());
         }
         return profile;
     }
@@ -4891,7 +4872,7 @@ namespace winrt::TerminalApp::implementation
             return;
         }
 
-        const auto theme = _currentWindowSettings().CurrentTheme();
+        const auto theme = _settings.GlobalSettings().CurrentTheme();
         auto requestedTheme{ theme.RequestedTheme() };
 
         {
@@ -4935,7 +4916,7 @@ namespace winrt::TerminalApp::implementation
                                                             theme.TabRow().UnfocusedBackground()) :
                                               ThemeColor{ nullptr } };
 
-        if (_currentWindowSettings().UseAcrylicInTabRow() && (_activated || _currentWindowSettings().EnableUnfocusedAcrylic()))
+        if (_settings.GlobalSettings().UseAcrylicInTabRow())
         {
             if (tabRowBg)
             {
@@ -4965,7 +4946,7 @@ namespace winrt::TerminalApp::implementation
             TitlebarBrush(backgroundSolidBrush);
         }
 
-        if (!_currentWindowSettings().ShowTabsInTitlebar())
+        if (!_settings.GlobalSettings().ShowTabsInTitlebar())
         {
             _tabRow.Background(TitlebarBrush());
         }
@@ -5201,7 +5182,7 @@ namespace winrt::TerminalApp::implementation
         // Feature_ShellCompletions::IsEnabled back in _RegisterTerminalEvents
 
         // User must explicitly opt-in on Preview builds
-        if (!_currentWindowSettings().EnableShellCompletionMenu())
+        if (!_settings.GlobalSettings().EnableShellCompletionMenu())
         {
             co_return;
         }

src/cascadia/TerminalApp/TerminalPage.h

@@ -228,7 +228,6 @@ namespace winrt::TerminalApp::implementation
         winrt::TerminalApp::ColorPickupFlyout _tabColorPicker{ nullptr };
 
         Microsoft::Terminal::Settings::Model::CascadiaSettings _settings{ nullptr };
-        Microsoft::Terminal::Settings::Model::GlobalAppSettings _currentWindowSettings() const;
 
         Windows::Foundation::Collections::IObservableVector<TerminalApp::Tab> _tabs;
         Windows::Foundation::Collections::IObservableVector<TerminalApp::Tab> _mruTabs;

src/cascadia/TerminalApp/TerminalWindow.cpp

@@ -260,13 +260,6 @@ namespace winrt::TerminalApp::implementation
         }
     }
 
-    // Today this returns the same GlobalAppSettings object. A follow-up
-    // change will replace it with a real per-window settings type.
-    GlobalAppSettings TerminalWindow::_currentWindowSettings() const
-    {
-        return _settings.WindowSettingsDefaults();
-    }
-
     winrt::Windows::UI::Xaml::ElementTheme TerminalWindow::GetRequestedTheme()
     {
         return Theme().RequestedTheme();
@@ -274,37 +267,37 @@ namespace winrt::TerminalApp::implementation
 
     bool TerminalWindow::GetShowTabsInTitlebar()
     {
-        return _currentWindowSettings().ShowTabsInTitlebar();
+        return _settings.GlobalSettings().ShowTabsInTitlebar();
     }
 
     bool TerminalWindow::GetInitialAlwaysOnTop()
     {
-        return _currentWindowSettings().AlwaysOnTop();
+        return _settings.GlobalSettings().AlwaysOnTop();
     }
 
     bool TerminalWindow::GetInitialShowTabsFullscreen()
     {
-        return _currentWindowSettings().ShowTabsFullscreen();
+        return _settings.GlobalSettings().ShowTabsFullscreen();
     }
 
     bool TerminalWindow::GetMinimizeToNotificationArea()
     {
-        return _currentWindowSettings().MinimizeToNotificationArea();
+        return _settings.GlobalSettings().MinimizeToNotificationArea();
     }
 
     bool TerminalWindow::GetAlwaysShowNotificationIcon()
     {
-        return _currentWindowSettings().AlwaysShowNotificationIcon();
+        return _settings.GlobalSettings().AlwaysShowNotificationIcon();
     }
 
     bool TerminalWindow::GetShowTitleInTitlebar()
     {
-        return _currentWindowSettings().ShowTitleInTitlebar();
+        return _settings.GlobalSettings().ShowTitleInTitlebar();
     }
 
     Microsoft::Terminal::Settings::Model::Theme TerminalWindow::Theme()
     {
-        return _currentWindowSettings().CurrentTheme();
+        return _settings.GlobalSettings().CurrentTheme();
     }
 
     // WinUI can't show 2 dialogs simultaneously. Yes, really. If you do, you get an exception.
@@ -381,7 +374,7 @@ namespace winrt::TerminalApp::implementation
         auto themingLambda{ [weak](const Windows::Foundation::IInspectable& sender, const RoutedEventArgs&) {
             if (const auto strong = weak.get())
             {
-                auto theme{ strong->_currentWindowSettings().CurrentTheme() };
+                auto theme{ strong->_settings.GlobalSettings().CurrentTheme() };
                 auto requestedTheme{ theme.RequestedTheme() };
                 auto element{ sender.try_as<winrt::Windows::UI::Xaml::FrameworkElement>() };
                 while (element)
@@ -605,7 +598,7 @@ namespace winrt::TerminalApp::implementation
         // --focusMode on the commandline here, and the mode in the settings.
         // Below, we'll also account for if focus mode was persisted into the
         // session for restoration.
-        bool focusMode = _appArgs && _appArgs->ParsedArgs().GetLaunchMode().value_or(_currentWindowSettings().LaunchMode()) == LaunchMode::FocusMode;
+        bool focusMode = _appArgs && _appArgs->ParsedArgs().GetLaunchMode().value_or(_settings.GlobalSettings().LaunchMode()) == LaunchMode::FocusMode;
 
         const auto scale = static_cast<float>(dpi) / static_cast<float>(USER_DEFAULT_SCREEN_DPI);
         if (const auto layout = LoadPersistedLayout())
@@ -652,7 +645,7 @@ namespace winrt::TerminalApp::implementation
         // GH#2061 - If the global setting "Always show tab bar" is
         // set or if "Show tabs in title bar" is set, then we'll need to add
         // the height of the tab bar here.
-        if (_currentWindowSettings().ShowTabsInTitlebar() && !focusMode)
+        if (_settings.GlobalSettings().ShowTabsInTitlebar() && !focusMode)
         {
             // In the past, we used to actually instantiate a TitlebarControl
             // and use Measure() to determine the DesiredSize of the control, to
@@ -670,7 +663,7 @@ namespace winrt::TerminalApp::implementation
             static constexpr auto titlebarHeight = 40;
             proposedSize.Height += (titlebarHeight)*scale;
         }
-        else if (_currentWindowSettings().AlwaysShowTabs() && !focusMode)
+        else if (_settings.GlobalSettings().AlwaysShowTabs() && !focusMode)
         {
             // Same comment as above, but with a TabRowControl.
             //
@@ -703,7 +696,7 @@ namespace winrt::TerminalApp::implementation
 
         // GH#4620/#5801 - If the user passed --maximized or --fullscreen on the
         // commandline, then use that to override the value from the settings.
-        const auto valueFromSettings = _currentWindowSettings().LaunchMode();
+        const auto valueFromSettings = _settings.GlobalSettings().LaunchMode();
         const auto valueFromCommandlineArgs = _appArgs ? _appArgs->ParsedArgs().GetLaunchMode() : std::nullopt;
         if (const auto layout = LoadPersistedLayout())
         {
@@ -729,7 +722,7 @@ namespace winrt::TerminalApp::implementation
     // - a point containing the requested initial position in pixels.
     TerminalApp::InitialPosition TerminalWindow::GetInitialPosition(int64_t defaultInitialX, int64_t defaultInitialY)
     {
-        auto initialPosition{ _currentWindowSettings().InitialPosition() };
+        auto initialPosition{ _settings.GlobalSettings().InitialPosition() };
 
         if (const auto layout = LoadPersistedLayout())
         {
@@ -777,7 +770,7 @@ namespace winrt::TerminalApp::implementation
 
         return !_contentBounds &&
                !hadPersistedPosition &&
-               _currentWindowSettings().CenterOnLaunch() &&
+               _settings.GlobalSettings().CenterOnLaunch() &&
                (_appArgs && !_appArgs->ParsedArgs().GetPosition().has_value());
     }
 
@@ -1195,7 +1188,7 @@ namespace winrt::TerminalApp::implementation
 
     bool TerminalWindow::AutoHideWindow()
     {
-        return _currentWindowSettings().AutoHideWindow();
+        return _settings.GlobalSettings().AutoHideWindow();
     }
 
     void TerminalWindow::UpdateSettingsHandler(const winrt::IInspectable& /*sender*/,
@@ -1339,13 +1332,13 @@ namespace winrt::TerminalApp::implementation
 
         if (!FocusMode())
         {
-            if (!_currentWindowSettings().AlwaysShowTabs())
+            if (!_settings.GlobalSettings().AlwaysShowTabs())
             {
                 // Hide the title bar = off, Always show tabs = off.
                 static constexpr auto titlebarHeight = 10;
                 pixelSize.Height += (titlebarHeight)*scale;
             }
-            else if (!_currentWindowSettings().ShowTabsInTitlebar())
+            else if (!_settings.GlobalSettings().ShowTabsInTitlebar())
             {
                 // Hide the title bar = off, Always show tabs = on.
                 static constexpr auto titlebarAndTabBarHeight = 40;

src/cascadia/TerminalApp/TerminalWindow.h

@@ -196,7 +196,6 @@ namespace winrt::TerminalApp::implementation
         bool _IsKeyboardServiceEnabled();
 
         void _RefreshThemeRoutine();
-        Microsoft::Terminal::Settings::Model::GlobalAppSettings _currentWindowSettings() const;
         void _OnLoaded(const IInspectable& sender, const Windows::UI::Xaml::RoutedEventArgs& eventArgs);
         void _pageInitialized(const IInspectable& sender, const IInspectable& eventArgs);
         void _OpenSettingsUI();

src/cascadia/TerminalConnection/ConptyConnection.cpp

@@ -289,11 +289,6 @@ namespace winrt::Microsoft::Terminal::TerminalConnection::implementation
                 }
             }
 
-            if (unbox_prop_or<bool>(settings, L"ambiguousIsWide", false))
-            {
-                _flags |= PSEUDOCONSOLE_AMBIGUOUS_IS_WIDE;
-            }
-
             const auto& initialEnvironment{ unbox_prop_or<winrt::hstring>(settings, L"initialEnvironment", L"") };
             const bool reloadEnvironmentVariables = unbox_prop_or<bool>(settings, L"reloadEnvironmentVariables", false);
 

src/cascadia/TerminalConnection/Resources/sr-Cyrl-RS/Resources.resw

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -209,7 +209,7 @@
   </data>
   <data name="CtrlDToClose" xml:space="preserve">
     <value>Сада можете да затворите овај терминал са Ctrl+D, или да притиснете Ентер да га поново покренете.</value>
-    <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
+	  <comment>"Ctrl+D" and "Enter" represent keys the user will press (control+D and Enter).</comment>
   </data>
   <data name="ProcessFailedToLaunch" xml:space="preserve">
     <value>[грешка {0} приликом покретања `{1}']</value>
@@ -220,7 +220,7 @@
     <value>Не може да се приступи почетном директоријуму „{0}”</value>
     <comment>The first argument {0} is a path to a directory on the filesystem, as provided by the user.</comment>
   </data>
-  <data name="ElevationRequired" xml:space="preserve">
+    <data name="ElevationRequired" xml:space="preserve">
     <value>Тражена операција захтева веће привилегије.</value>
   </data>
   <data name="FileNotFound" xml:space="preserve">

src/cascadia/TerminalControl/ControlCore.cpp

@@ -85,12 +85,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation
                 break;
             }
             CodepointWidthDetector::Singleton().Reset(mode);
-
-            if (settings.AmbiguousWidth() == AmbiguousWidth::Wide)
-            {
-                CodepointWidthDetector::Singleton().SetAmbiguousWidth(2);
-            }
-
             return true;
         }();
 

src/cascadia/TerminalControl/EventArgs.idl

@@ -26,12 +26,6 @@ namespace Microsoft.Terminal.Control
         Console,
     };
 
-    enum AmbiguousWidth
-    {
-        Narrow,
-        Wide,
-    };
-
     enum DefaultInputScope
     {
         Default,

src/cascadia/TerminalControl/IControlSettings.idl

@@ -68,7 +68,6 @@ namespace Microsoft.Terminal.Control
         Boolean DisablePartialInvalidation { get; };
         Boolean SoftwareRendering { get; };
         Microsoft.Terminal.Control.TextMeasurement TextMeasurement { get; };
-        Microsoft.Terminal.Control.AmbiguousWidth AmbiguousWidth { get; };
         Microsoft.Terminal.Control.DefaultInputScope DefaultInputScope { get; };
         Boolean ShowMarks { get; };
         Boolean UseBackgroundImageForWindow { get; };

src/cascadia/TerminalCore/Terminal.cpp

@@ -513,27 +513,52 @@ std::wstring Terminal::GetHyperlinkAtViewportPosition(const til::point viewportP
 
 std::wstring Terminal::GetHyperlinkAtBufferPosition(const til::point bufferPos)
 {
-    const auto& buffer = _activeBuffer();
-
     // Case 1: buffer position has a hyperlink stored in the buffer
-    const auto attr = buffer.GetCellDataAt(bufferPos)->TextAttr();
+    const auto attr = _activeBuffer().GetCellDataAt(bufferPos)->TextAttr();
     if (attr.IsHyperlink())
     {
-        return buffer.GetHyperlinkUriFromId(attr.GetHyperlinkId());
+        return _activeBuffer().GetHyperlinkUriFromId(attr.GetHyperlinkId());
     }
 
     // Case 2: buffer position may point to an auto-detected hyperlink
-    // Check cached interval tree (covers visible viewport +/- viewport height)
-    if (const auto results = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos); !results.empty())
+    // Case 2 - Step 1: get the auto-detected hyperlink
+    std::optional<interval_tree::Interval<til::point, size_t>> result;
+    const auto visibleViewport = _GetVisibleViewport();
+    if (visibleViewport.IsInBounds(bufferPos))
     {
-        for (const auto& result : results)
+        // Hyperlink is in the current view, so let's just get it
+        auto viewportPos = bufferPos;
+        visibleViewport.ConvertToOrigin(&viewportPos);
+        result = GetHyperlinkIntervalFromViewportPosition(viewportPos);
+        if (result.has_value())
         {
-            if (result.value == _hyperlinkPatternId)
-            {
-                return buffer.GetPlainText(result.start, result.stop);
-            }
+            result->start = _ConvertToBufferCell(result->start, false);
+            result->stop = _ConvertToBufferCell(result->stop, true);
         }
     }
+    else
+    {
+        // Hyperlink is outside of the current view.
+        // We need to find if there's a pattern at that location.
+        const auto patterns = _getPatterns(bufferPos.y, bufferPos.y);
+
+        // NOTE: patterns is stored with top y-position being 0,
+        //       so we need to cleverly set the y-pos to 0.
+        const til::point viewportPos{ bufferPos.x, 0 };
+        const auto results = patterns.findOverlapping(viewportPos, viewportPos);
+        if (!results.empty())
+        {
+            result = results.front();
+            result->start.y += bufferPos.y;
+            result->stop.y += bufferPos.y;
+        }
+    }
+
+    // Case 2 - Step 2: get the auto-detected hyperlink
+    if (result.has_value() && result->value == _hyperlinkPatternId)
+    {
+        return _activeBuffer().GetPlainText(result->start, result->stop);
+    }
     return {};
 }
 
@@ -553,25 +578,17 @@ uint16_t Terminal::GetHyperlinkIdAtViewportPosition(const til::point viewportPos
 // Arguments:
 // - The position relative to the viewport
 // Return value:
-// - The interval representing the start and end coordinates (viewport-relative)
+// - The interval representing the start and end coordinates
 std::optional<PointTree::interval> Terminal::GetHyperlinkIntervalFromViewportPosition(const til::point viewportPos)
 {
-    // GH#18177: The tree stores buffer-absolute coordinates
-    // Convert viewport-relative (y=0 at visible start) to buffer-absolute
-    const auto visStart = _VisibleStartIndex();
-    const til::point bufferPos{ viewportPos.x, viewportPos.y + visStart };
-    const auto results = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos);
+    const auto results = _patternIntervalTree.findOverlapping({ viewportPos.x + 1, viewportPos.y }, viewportPos);
     if (results.size() > 0)
     {
         for (const auto& result : results)
         {
             if (result.value == _hyperlinkPatternId)
             {
-                // Convert back to viewport-relative coordinates
-                auto interval = result;
-                interval.start.y -= visStart;
-                interval.stop.y -= visStart;
-                return interval;
+                return result;
             }
         }
     }
@@ -790,8 +807,11 @@ TerminalInput::OutputType Terminal::FocusChanged(const bool focused)
 // - The interval tree containing regions that need to be invalidated
 void Terminal::_InvalidatePatternTree()
 {
+    const auto vis = _VisibleStartIndex();
     _patternIntervalTree.visit_all([&](const PointTree::interval& interval) {
-        _InvalidateFromCoords(interval.start, interval.stop);
+        const til::point startCoord{ interval.start.x, interval.start.y + vis };
+        const til::point endCoord{ interval.stop.x, interval.stop.y + vis };
+        _InvalidateFromCoords(startCoord, endCoord);
     });
 }
 
@@ -1189,16 +1209,7 @@ void Terminal::SetPlayMidiNoteCallback(std::function<void(const int, const int,
 void Terminal::UpdatePatternsUnderLock()
 {
     _InvalidatePatternTree();
-    const auto visStart = _VisibleStartIndex();
-    const auto visEnd = _VisibleEndIndex();
-    const auto viewportHeight = visEnd - visStart;
-
-    // GH#18177: Scan extra rows beyond the viewport so that URLs
-    // wrapping across the viewport boundary are matched in full
-    const auto bufferSize = _activeBuffer().GetSize();
-    const auto beg = std::max<til::CoordType>(0, visStart - viewportHeight);
-    const auto end = std::min(bufferSize.BottomInclusive(), visEnd + viewportHeight);
-    _patternIntervalTree = _getPatterns(beg, end);
+    _patternIntervalTree = _getPatterns(_VisibleStartIndex(), _VisibleEndIndex());
     _InvalidatePatternTree();
 }
 
@@ -1413,8 +1424,10 @@ PointTree Terminal::_getPatterns(til::CoordType beg, til::CoordType end) const
         {
             do
             {
-                // PointTree uses half-open ranges and buffer-absolute coordinates.
-                const auto range = ICU::BufferRangeFromMatch(&text, re.get());
+                auto range = ICU::BufferRangeFromMatch(&text, re.get());
+                // PointTree uses half-open ranges and viewport-relative coordinates.
+                range.start.y -= beg;
+                range.end.y -= beg;
                 intervals.push_back(PointTree::interval(range.start, range.end, 0));
             } while (uregex_findNext(re.get(), &status));
         }

src/cascadia/TerminalCore/Terminal.hpp

@@ -204,7 +204,7 @@ public:
     bool IsGridLineDrawingAllowed() noexcept override;
     std::wstring GetHyperlinkUri(uint16_t id) const override;
     std::wstring GetHyperlinkCustomId(uint16_t id) const override;
-    std::vector<size_t> GetPatternId(const til::point viewportPos) const override;
+    std::vector<size_t> GetPatternId(const til::point location) const override;
 
     std::pair<COLORREF, COLORREF> GetAttributeColors(const TextAttribute& attr) const noexcept override;
     std::span<const til::point_span> GetSelectionSpans() const noexcept override;
@@ -397,6 +397,7 @@ private:
     std::wstring _wordDelimiters;
     SelectionExpansion _multiClickSelectionMode = SelectionExpansion::Char;
     SelectionInteractionMode _selectionMode = SelectionInteractionMode::None;
+    bool _selectionIsTargetingUrl = false;
     SelectionEndpoint _selectionEndpoint = SelectionEndpoint::None;
     bool _anchorInactiveSelectionEndpoint = false;
 #pragma endregion

src/cascadia/TerminalCore/TerminalApi.cpp

@@ -140,7 +140,7 @@ unsigned int Terminal::GetInputCodePage() const noexcept
 
 void Terminal::CopyToClipboard(wil::zwstring_view content)
 {
-    if (_clipboardOperationsAllowed && _focused)
+    if (_clipboardOperationsAllowed)
     {
         _pfnCopyToClipboard(content);
     }

src/cascadia/TerminalCore/TerminalSelection.cpp

@@ -254,6 +254,7 @@ void Terminal::_SetSelectionEnd(SelectionInfo* selection, const til::point viewp
         std::tie(selection->start, selection->end) = expandedAnchors;
     }
     _selectionMode = SelectionInteractionMode::Mouse;
+    _selectionIsTargetingUrl = false;
 }
 
 // Method Description:
@@ -398,6 +399,7 @@ void Terminal::ToggleMarkMode()
         }
         _ScrollToPoint(_selection->start);
         _selectionMode = SelectionInteractionMode::Mark;
+        _selectionIsTargetingUrl = false;
     }
 }
 
@@ -458,6 +460,7 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
     if (_selectionMode != SelectionInteractionMode::Mark)
     {
         // This feature only works in mark mode
+        _selectionIsTargetingUrl = false;
         return;
     }
 
@@ -466,10 +469,19 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
     const auto bufferSize = buffer.GetSize();
     const auto viewportHeight = _GetMutableViewport().Height();
 
+    // The patterns are stored relative to the "search area". Initially, this search area will be the viewport,
+    // but as we progressively search through more of the buffer, this will change.
+    // Keep track of the search area here, and use the lambda below to convert points to the search area coordinate space.
+    auto searchArea = _GetVisibleViewport();
+    auto convertToSearchArea = [&searchArea](const til::point pt) noexcept {
+        auto copy = pt;
+        searchArea.ConvertToOrigin(&copy);
+        return copy;
+    };
+
     // extracts the next/previous hyperlink from the list of hyperlink ranges provided
     auto extractResultFromList = [&](std::vector<interval_tree::Interval<til::point, size_t>>& list) noexcept {
-        const auto selectionStart = _selection->start;
-        const auto selectionEnd = _selection->end;
+        const auto selectionStartInSearchArea = convertToSearchArea(_selection->start);
 
         std::optional<std::pair<til::point, til::point>> resultFromList;
         if (!list.empty())
@@ -479,11 +491,12 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                 // pattern tree includes the currently selected range when going forward,
                 // so we need to check if we're pointing to that one before returning it.
                 auto range = list.front();
-                if (range.start == selectionStart && range.stop == selectionEnd)
+                if (_selectionIsTargetingUrl && range.start == selectionStartInSearchArea)
                 {
                     if (list.size() > 1)
                     {
-                        // Selection matches the current URL, pick the next one
+                        // if we're pointing to the currently selected URL,
+                        // pick the next one.
                         range = til::at(list, 1);
                         resultFromList = { range.start, range.stop };
                     }
@@ -508,6 +521,14 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                 resultFromList = { range.start, range.stop };
             }
         }
+
+        // pattern tree stores everything as viewport coords,
+        // so we need to convert them on the way out
+        if (resultFromList)
+        {
+            searchArea.ConvertFromOrigin(&resultFromList->first);
+            searchArea.ConvertFromOrigin(&resultFromList->second);
+        }
         return resultFromList;
     };
 
@@ -525,8 +546,8 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
         searchEnd = _selection->start;
     }
 
-    // 1.A) Try searching the cached pattern tree (no scanning required)
-    auto resultList = _patternIntervalTree.findContained(searchStart, searchEnd);
+    // 1.A) Try searching the current viewport (no scrolling required)
+    auto resultList = _patternIntervalTree.findContained(convertToSearchArea(searchStart), convertToSearchArea(searchEnd));
     std::optional<std::pair<til::point, til::point>> result = extractResultFromList(resultList);
     if (!result)
     {
@@ -541,12 +562,14 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
             searchEnd = { bufferSize.RightInclusive(), searchStart.y - 1 };
             searchStart = { bufferSize.Left(), std::max(searchStart.y - viewportHeight, bufferSize.Top()) };
         }
+        searchArea = Viewport::FromDimensions(searchStart, { searchEnd.x + 1, searchEnd.y + 1 });
+
         const til::point bufferStart{ bufferSize.Origin() };
         const til::point bufferEnd{ bufferSize.RightInclusive(), ViewEndIndex() };
         while (!result && bufferSize.IsInBounds(searchStart) && bufferSize.IsInBounds(searchEnd) && searchStart <= searchEnd && bufferStart <= searchStart && searchEnd <= bufferEnd)
         {
             auto patterns = _getPatterns(searchStart.y, searchEnd.y);
-            resultList = patterns.findContained(searchStart, searchEnd);
+            resultList = patterns.findContained(convertToSearchArea(searchStart), convertToSearchArea(searchEnd));
             result = extractResultFromList(resultList);
             if (!result)
             {
@@ -560,6 +583,7 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
                     searchEnd.y -= 1;
                     searchStart.y = std::max(searchEnd.y - viewportHeight, bufferSize.Top());
                 }
+                searchArea = Viewport::FromDimensions(searchStart, { searchEnd.x + 1, searchEnd.y + 1 });
             }
         }
     }
@@ -632,10 +656,11 @@ void Terminal::SelectHyperlink(const SearchDirection dir)
     selection->start = result->first;
     selection->pivot = result->first;
     selection->end = result->second;
+    _selectionIsTargetingUrl = true;
     _selectionEndpoint = SelectionEndpoint::End;
 
     // 4. Scroll to the selected area (if necessary)
-    _ScrollToPoint(dir == SearchDirection::Forward ? selection->end : selection->start);
+    _ScrollToPoint(selection->end);
 }
 
 Terminal::UpdateSelectionParams Terminal::ConvertKeyEventToUpdateSelectionParams(const ControlKeyStates mods, const WORD vkey) const noexcept
@@ -743,6 +768,7 @@ void Terminal::UpdateSelection(SelectionDirection direction, SelectionExpansion
     }
 
     // 3. Actually modify the selection state
+    _selectionIsTargetingUrl = false;
     _selectionMode = std::max(_selectionMode, SelectionInteractionMode::Keyboard);
 
     auto selection{ _selection.write() };
@@ -785,6 +811,7 @@ void Terminal::SelectAll()
     };
 
     _selectionMode = SelectionInteractionMode::Keyboard;
+    _selectionIsTargetingUrl = false;
     _ScrollToPoint(_selection->start);
 }
 
@@ -916,6 +943,7 @@ void Terminal::ClearSelection()
     _assertLocked();
     _selection.write()->active = false;
     _selectionMode = SelectionInteractionMode::None;
+    _selectionIsTargetingUrl = false;
     _selectionEndpoint = static_cast<SelectionEndpoint>(0);
     _anchorInactiveSelectionEndpoint = false;
 }
@@ -1017,9 +1045,5 @@ void Terminal::_ScrollToPoint(const til::point pos)
         }
         _NotifyScrollEvent();
         _activeBuffer().TriggerScroll();
-
-        // Rebuild the pattern tree for the new viewport position
-        // so that callers always find a fresh cache after scrolling
-        _updateUrlDetection();
     }
 }

src/cascadia/TerminalCore/terminalrenderdata.cpp

@@ -74,16 +74,15 @@ std::wstring Microsoft::Terminal::Core::Terminal::GetHyperlinkCustomId(uint16_t
 // Method Description:
 // - Gets the regex pattern ids of a location
 // Arguments:
-// - The viewport-relative location
+// - The location
 // Return value:
 // - The pattern IDs of the location
-std::vector<size_t> Terminal::GetPatternId(const til::point viewportPos) const
+std::vector<size_t> Terminal::GetPatternId(const til::point location) const
 {
     _assertLocked();
 
-    // Convert viewport-relative (y=0 at visible start) to buffer-absolute
-    const til::point bufferPos{ viewportPos.x, viewportPos.y + _VisibleStartIndex() };
-    const auto intervals = _patternIntervalTree.findOverlapping({ bufferPos.x + 1, bufferPos.y }, bufferPos);
+    // Look through our interval tree for this location
+    const auto intervals = _patternIntervalTree.findOverlapping({ location.x + 1, location.y }, location);
     if (intervals.size() == 0)
     {
         return {};

src/cascadia/TerminalSettingsAppAdapterLib/TerminalSettings.cpp

@@ -55,10 +55,9 @@ namespace winrt::Microsoft::Terminal::Settings
         auto settings{ winrt::make_self<TerminalSettings>() };
 
         const auto globals = appSettings.GlobalSettings();
-        const auto windowDefaults = appSettings.WindowSettingsDefaults();
         settings->_ApplyProfileSettings(profile);
-        settings->_ApplyWindowSettings(windowDefaults);
-        settings->_ApplyAppearanceSettings(profile.DefaultAppearance(), globals.ColorSchemes(), windowDefaults.CurrentTheme());
+        settings->_ApplyGlobalSettings(globals);
+        settings->_ApplyAppearanceSettings(profile.DefaultAppearance(), globals.ColorSchemes(), globals.CurrentTheme());
 
         return settings;
     }
@@ -89,10 +88,9 @@ namespace winrt::Microsoft::Terminal::Settings
         if (const auto& unfocusedAppearance{ profile.UnfocusedAppearance() })
         {
             const auto globals = appSettings.GlobalSettings();
-            const auto windowDefaults = appSettings.WindowSettingsDefaults();
             child = winrt::make_self<TerminalSettings>();
             child->_parent = settings->get_strong();
-            child->_ApplyAppearanceSettings(unfocusedAppearance, globals.ColorSchemes(), windowDefaults.CurrentTheme());
+            child->_ApplyAppearanceSettings(unfocusedAppearance, globals.ColorSchemes(), globals.CurrentTheme());
         }
 
         return TerminalSettingsCreateResult{ settings.get(), child.get() };
@@ -363,7 +361,7 @@ namespace winrt::Microsoft::Terminal::Settings
     // - globalSettings: the global property values we're applying.
     // Return Value:
     // - <none>
-    void TerminalSettings::_ApplyWindowSettings(const Model::GlobalAppSettings& globalSettings) noexcept
+    void TerminalSettings::_ApplyGlobalSettings(const Model::GlobalAppSettings& globalSettings) noexcept
     {
         _InitialRows = globalSettings.InitialRows();
         _InitialCols = globalSettings.InitialCols();
@@ -378,7 +376,6 @@ namespace winrt::Microsoft::Terminal::Settings
         _DisablePartialInvalidation = globalSettings.DisablePartialInvalidation();
         _SoftwareRendering = globalSettings.SoftwareRendering();
         _TextMeasurement = globalSettings.TextMeasurement();
-        _AmbiguousWidth = globalSettings.AmbiguousWidth();
         _DefaultInputScope = globalSettings.DefaultInputScope();
         _UseBackgroundImageForWindow = globalSettings.UseBackgroundImageForWindow();
         _TrimBlockSelection = globalSettings.TrimBlockSelection();

src/cascadia/TerminalSettingsAppAdapterLib/TerminalSettings.h

@@ -105,7 +105,7 @@ namespace winrt::Microsoft::Terminal::Settings
         static winrt::com_ptr<TerminalSettings> _CreateWithProfileCommon(const Model::CascadiaSettings& appSettings, const Model::Profile& profile);
         void _ApplyProfileSettings(const Model::Profile& profile);
 
-        void _ApplyWindowSettings(const Model::GlobalAppSettings& windowSettings) noexcept;
+        void _ApplyGlobalSettings(const Model::GlobalAppSettings& globalSettings) noexcept;
         void _ApplyAppearanceSettings(const Microsoft::Terminal::Settings::Model::IAppearanceConfig& appearance,
                                       const Windows::Foundation::Collections::IMapView<hstring, Microsoft::Terminal::Settings::Model::ColorScheme>& schemes,
                                       const winrt::Microsoft::Terminal::Settings::Model::Theme currentTheme);

src/cascadia/TerminalSettingsEditor/Actions.cpp

@@ -4,7 +4,6 @@
 #include "pch.h"
 #include "Actions.h"
 #include "Actions.g.cpp"
-#include "LibraryResources.h"
 #include "../TerminalSettingsModel/AllShortcutActions.h"
 
 using namespace winrt::Windows::UI::Xaml;
@@ -21,9 +20,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Actions::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ActionsViewModel>();
-        _ViewModel.ReSortCommandList();
+        _ViewModel = e.Parameter().as<Editor::ActionsViewModel>();
+        _ViewModel.CurrentPage(ActionsSubPage::Base);
         auto vmImpl = get_self<ActionsViewModel>(_ViewModel);
         vmImpl->MarkAsVisited();
         _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
@@ -32,7 +30,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             AddNewButton().Focus(FocusState::Programmatic);
         });
-        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,

src/cascadia/TerminalSettingsEditor/Actions.xaml

@@ -164,33 +164,17 @@
                                    Style="{StaticResource KeyBindingNameTextBlockStyle}"
                                    Text="{x:Bind DisplayName, Mode=OneWay}" />
                         <!--  Key Chord Text  -->
-                        <Grid Grid.Column="1"
-                              HorizontalAlignment="Right"
-                              VerticalAlignment="Center"
-                              ColumnSpacing="4">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Border Grid.Column="0"
-                                    Padding="8,4,8,4"
-                                    Style="{ThemeResource KeyChordBorderStyle}"
-                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(FirstKeyChordText)}">
-                                <TextBlock FontSize="14"
-                                           Style="{ThemeResource KeyChordTextBlockStyle}"
-                                           Text="{x:Bind FirstKeyChordText, Mode=OneWay}"
-                                           TextWrapping="WrapWholeWords" />
-                            </Border>
-                            <Border Grid.Column="1"
-                                    Padding="8,4,8,4"
-                                    Style="{ThemeResource KeyChordBorderStyle}"
-                                    ToolTipService.ToolTip="{x:Bind AdditionalKeyChordTooltipText, Mode=OneWay}"
-                                    Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(AdditionalKeyChordCountText)}">
-                                <TextBlock FontSize="14"
-                                           Style="{ThemeResource KeyChordTextBlockStyle}"
-                                           Text="{x:Bind AdditionalKeyChordCountText, Mode=OneWay}" />
-                            </Border>
-                        </Grid>
+                        <Border Grid.Column="1"
+                                Padding="8,4,8,4"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Style="{ThemeResource KeyChordBorderStyle}"
+                                Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(FirstKeyChordText)}">
+                            <TextBlock FontSize="14"
+                                       Style="{ThemeResource KeyChordTextBlockStyle}"
+                                       Text="{x:Bind FirstKeyChordText, Mode=OneWay}"
+                                       TextWrapping="WrapWholeWords" />
+                        </Border>
                     </Grid>
                 </ListViewItem>
             </DataTemplate>
@@ -198,7 +182,8 @@
     </Page.Resources>
 
     <Border MaxWidth="{StaticResource StandardControlMaxWidth}">
-        <StackPanel HorizontalAlignment="Stretch"
+        <StackPanel MaxWidth="600"
+                    HorizontalAlignment="Left"
                     Spacing="8"
                     Style="{StaticResource SettingsStackStyle}">
             <HyperlinkButton x:Uid="Actions_Disclaimer"

src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp

@@ -126,23 +126,18 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void CommandViewModel::Name(const winrt::hstring& newName)
     {
-        if (_command.Name() != newName)
+        _command.Name(newName);
+        if (newName.empty())
         {
-            _command.Name(newName);
+            // if the name was cleared, refresh the DisplayName
             _NotifyChanges(L"DisplayName", L"DisplayNameAndKeyChordAutomationPropName");
-            _cachedDisplayName.clear();
         }
+        _cachedDisplayName.clear();
     }
 
     winrt::hstring CommandViewModel::DisplayNameAndKeyChordAutomationPropName()
     {
-        auto result = DisplayName() + L", " + FirstKeyChordText();
-        const auto size = _KeyChordList.Size();
-        if (size > 1)
-        {
-            result = result + L" " + hstring{ RS_fmt(L"Actions_AdditionalKeyChords", winrt::to_hstring(size - 1)) };
-        }
-        return result;
+        return DisplayName() + L", " + FirstKeyChordText();
     }
 
     winrt::hstring CommandViewModel::FirstKeyChordText()
@@ -154,35 +149,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         return L"";
     }
 
-    winrt::hstring CommandViewModel::AdditionalKeyChordCountText()
-    {
-        const auto size = _KeyChordList.Size();
-        if (size > 1)
-        {
-            return winrt::hstring{ L"+" + winrt::to_hstring(size - 1) };
-        }
-        return L"";
-    }
-
-    winrt::hstring CommandViewModel::AdditionalKeyChordTooltipText()
-    {
-        const auto size = _KeyChordList.Size();
-        if (size <= 1)
-        {
-            return L"";
-        }
-        std::wstring result;
-        for (uint32_t i = 1; i < size; ++i)
-        {
-            if (!result.empty())
-            {
-                result += L"\n";
-            }
-            result += std::wstring_view{ _KeyChordList.GetAt(i).KeyChordText() };
-        }
-        return winrt::hstring{ result };
-    }
-
     winrt::hstring CommandViewModel::ID()
     {
         return _command.ID();
@@ -209,7 +175,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         kbdVM->IsInEditMode(true);
         _RegisterKeyChordVMEvents(*kbdVM);
         KeyChordList().Append(*kbdVM);
-        FocusContainer.raise(*this, *kbdVM);
     }
 
     winrt::hstring CommandViewModel::ActionNameTextBoxAutomationPropName()
@@ -321,10 +286,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     weak->_ReplaceCommandWithUserCopy(false);
                 }
-                if (!weak->_command.HasName())
-                {
-                    weak->_NotifyChanges(L"DisplayName");
-                }
+                weak->_NotifyChanges(L"DisplayName");
             }
         });
     }
@@ -361,10 +323,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _RegisterActionArgsVMEvents(*actionArgsVM);
         actionArgsVM->Initialize();
         ActionArgsVM(*actionArgsVM);
-        if (!_command.HasName())
-        {
-            _NotifyChanges(L"DisplayName");
-        }
+        _NotifyChanges(L"DisplayName");
     }
 
     ArgWrapper::ArgWrapper(const Model::ArgDescriptor& descriptor, const Windows::Foundation::IInspectable& value) :
@@ -543,13 +502,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         auto lifetime = get_strong();
 
         static constexpr winrt::guid clientGuidFiles{ 0xbd00ae34, 0x839b, 0x43f6, { 0x8b, 0x94, 0x12, 0x37, 0x1a, 0xfe, 0xea, 0xb5 } };
-
-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
+        const auto parentHwnd{ reinterpret_cast<HWND>(_WindowRoot.GetHostingWindow()) };
         auto path = co_await OpenFilePicker(parentHwnd, [](auto&& dialog) {
             THROW_IF_FAILED(dialog->SetClientGuid(clientGuidFiles));
             try
@@ -572,13 +525,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         auto lifetime = get_strong();
 
         static constexpr winrt::guid clientGuidFolders{ 0xa611027, 0x42be, 0x4665, { 0xaf, 0xf1, 0x3f, 0x22, 0x26, 0xe9, 0xf7, 0x4d } };
-
-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
+        ;
+        const auto parentHwnd{ reinterpret_cast<HWND>(_WindowRoot.GetHostingWindow()) };
         auto path = co_await OpenFilePicker(parentHwnd, [](auto&& dialog) {
             THROW_IF_FAILED(dialog->SetClientGuid(clientGuidFolders));
             try
@@ -1246,25 +1194,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         CurrentPage(ActionsSubPage::Edit);
     }
 
-    void ActionsViewModel::ReSortCommandList()
-    {
-        if (_CommandListDirty)
-        {
-            std::vector<Editor::CommandViewModel> commandList;
-            commandList.reserve(_CommandList.Size());
-            for (const auto& cmd : _CommandList)
-            {
-                commandList.push_back(cmd);
-            }
-            std::sort(commandList.begin(), commandList.end(), [](const Editor::CommandViewModel& lhs, const Editor::CommandViewModel& rhs) {
-                return lhs.DisplayName() < rhs.DisplayName();
-            });
-            _CommandList = single_threaded_observable_vector(std::move(commandList));
-            _NotifyChanges(L"CommandList");
-            _CommandListDirty = false;
-        }
-    }
-
     void ActionsViewModel::CurrentCommand(const Editor::CommandViewModel& newCommand)
     {
         _CurrentCommand = newCommand;
@@ -1435,17 +1364,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         cmdVM->DeleteRequested({ this, &ActionsViewModel::_CmdVMDeleteRequestedHandler });
         cmdVM->PropagateColorSchemeRequested({ this, &ActionsViewModel::_CmdVMPropagateColorSchemeRequestedHandler });
         cmdVM->PropagateColorSchemeNamesRequested({ this, &ActionsViewModel::_CmdVMPropagateColorSchemeNamesRequestedHandler });
-        cmdVM->PropertyChanged([weakThis{ get_weak() }](const IInspectable& sender, const Windows::UI::Xaml::Data::PropertyChangedEventArgs& args) {
-            if (const auto self{ weakThis.get() })
-            {
-                const auto senderVM{ sender.as<Editor::CommandViewModel>() };
-                const auto propertyName{ args.PropertyName() };
-                if (propertyName == L"DisplayName")
-                {
-                    // when a command's name changes, note that we need to re-sort the command list when we navigate back to the actions page
-                    self->_CommandListDirty = true;
-                }
-            }
-        });
     }
 }

src/cascadia/TerminalSettingsEditor/ActionsViewModel.h

@@ -37,6 +37,7 @@ Abstract:
 #pragma once
 
 #include "ActionsViewModel.g.h"
+#include "NavigateToCommandArgs.g.h"
 #include "CommandViewModel.g.h"
 #include "ArgWrapper.g.h"
 #include "ActionArgsViewModel.g.h"
@@ -47,6 +48,21 @@ Abstract:
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
+    struct NavigateToCommandArgs : NavigateToCommandArgsT<NavigateToCommandArgs>
+    {
+    public:
+        NavigateToCommandArgs(CommandViewModel command, Editor::IHostedInWindow windowRoot) :
+            _Command(command),
+            _WindowRoot(windowRoot) {}
+
+        Editor::IHostedInWindow WindowRoot() const noexcept { return _WindowRoot; }
+        Editor::CommandViewModel Command() const noexcept { return _Command; }
+
+    private:
+        Editor::IHostedInWindow _WindowRoot;
+        Editor::CommandViewModel _Command{ nullptr };
+    };
+
     struct ModifyKeyChordEventArgs : ModifyKeyChordEventArgsT<ModifyKeyChordEventArgs>
     {
     public:
@@ -74,8 +90,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         winrt::hstring DisplayNameAndKeyChordAutomationPropName();
 
         winrt::hstring FirstKeyChordText();
-        winrt::hstring AdditionalKeyChordCountText();
-        winrt::hstring AdditionalKeyChordTooltipText();
 
         winrt::hstring ID();
         bool IsUserAction();
@@ -127,8 +141,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         winrt::hstring Type() const noexcept { return _descriptor.Type; };
         Model::ArgTypeHint TypeHint() const noexcept { return _descriptor.TypeHint; };
         bool Required() const noexcept { return _descriptor.Required; };
-        Editor::IHostedInWindow WindowRoot() const noexcept { return _WeakWindowRoot.get(); }
-        void WindowRoot(const Editor::IHostedInWindow& value) { _WeakWindowRoot = value; }
 
         // We cannot use the macro here because we need to implement additional logic for the setter
         Windows::Foundation::IInspectable EnumValue() const noexcept { return _EnumValue; };
@@ -174,10 +186,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         VIEW_MODEL_OBSERVABLE_PROPERTY(Editor::ColorSchemeViewModel, DefaultColorScheme, nullptr);
         VIEW_MODEL_OBSERVABLE_PROPERTY(Windows::Foundation::IInspectable, Value, nullptr);
         WINRT_PROPERTY(Windows::Foundation::Collections::IVector<winrt::hstring>, ColorSchemeNamesList, nullptr);
+        WINRT_PROPERTY(Editor::IHostedInWindow, WindowRoot, nullptr);
 
     private:
         Model::ArgDescriptor _descriptor;
-        winrt::weak_ref<Editor::IHostedInWindow> _WeakWindowRoot{ nullptr };
         Windows::Foundation::IInspectable _EnumValue{ nullptr };
         Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::EnumEntry> _EnumList;
         Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::FlagEntry> _FlagList;
@@ -258,7 +270,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool DisplayBadge() const noexcept;
 
         void AddNewCommand();
-        void ReSortCommandList();
 
         void CurrentCommand(const Editor::CommandViewModel& newCommand);
         Editor::CommandViewModel CurrentCommand();
@@ -280,7 +291,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Model::CascadiaSettings _Settings;
         Windows::Foundation::Collections::IMap<Model::ShortcutAction, winrt::hstring> _AvailableActionsAndNamesMap;
         Windows::Foundation::Collections::IMap<winrt::hstring, Model::ShortcutAction> _NameToActionMap;
-        bool _CommandListDirty{ false };
 
         void _MakeCommandVMsHelper();
         void _RegisterCmdVMEvents(com_ptr<implementation::CommandViewModel>& cmdVM);

src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl

@@ -35,6 +35,12 @@ namespace Microsoft.Terminal.Settings.Editor
         CommandViewModel ViewModel { get; };
     }
 
+    runtimeclass NavigateToCommandArgs
+    {
+        CommandViewModel Command { get; };
+        IHostedInWindow WindowRoot { get; };
+    }
+
     runtimeclass ModifyKeyChordEventArgs
     {
         Microsoft.Terminal.Control.KeyChord OldKeys { get; };
@@ -55,8 +61,6 @@ namespace Microsoft.Terminal.Settings.Editor
         // View-model specific
         String DisplayName { get; };
         String FirstKeyChordText { get; };
-        String AdditionalKeyChordCountText { get; };
-        String AdditionalKeyChordTooltipText { get; };
         String DisplayNameAndKeyChordAutomationPropName { get; };
 
         // UI side (command list page)
@@ -166,7 +170,6 @@ namespace Microsoft.Terminal.Settings.Editor
         void UpdateSettings(Microsoft.Terminal.Settings.Model.CascadiaSettings settings);
 
         void AddNewCommand();
-        void ReSortCommandList();
 
         ActionsSubPage CurrentPage;
         Boolean DisplayBadge { get; };

src/cascadia/TerminalSettingsEditor/AddProfile.cpp

@@ -26,9 +26,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void AddProfile::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _State = args.ViewModel().as<Editor::AddProfilePageNavigationState>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _State = e.Parameter().as<Editor::AddProfilePageNavigationState>();
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,

src/cascadia/TerminalSettingsEditor/AddProfile.xaml

@@ -37,8 +37,7 @@
             </Button>
         </Border>
         <StackPanel Margin="{StaticResource StandardControlMargin}">
-            <local:SettingContainer x:Name="DuplicateProfile"
-                                    x:Uid="AddProfile_Duplicate">
+            <local:SettingContainer x:Uid="AddProfile_Duplicate">
                 <ComboBox x:Name="Profiles"
                           AutomationProperties.AccessibilityView="Content"
                           ItemsSource="{x:Bind State.Settings.AllProfiles, Mode=OneWay}"

src/cascadia/TerminalSettingsEditor/Appearances.cpp

@@ -1138,27 +1138,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         INITIALIZE_BINDABLE_ENUM_SETTING(IntenseTextStyle, IntenseTextStyle, winrt::Microsoft::Terminal::Settings::Model::IntenseStyle, L"Appearance_IntenseTextStyle", L"Content");
     }
 
-    // Appearances doesn't implement HasScrollViewer<T> which normally adds this function.
-    void Appearances::BringIntoViewWhenLoaded(hstring elementToFocus)
-    {
-        if (elementToFocus.empty())
-        {
-            return;
-        }
-
-        _loadedRevoker = this->Loaded(winrt::auto_revoke, [weakThis{ get_weak() }, elementToFocus](auto&&, auto&&) {
-            if (const auto strongThis = weakThis.get())
-            {
-                if (const auto& controlToFocus{ strongThis->FindName(elementToFocus).try_as<Controls::Control>() })
-                {
-                    controlToFocus.as<FrameworkElement>().StartBringIntoView();
-                    controlToFocus.Focus(FocusState::Programmatic);
-                }
-                strongThis->_loadedRevoker.revoke();
-            }
-        });
-    }
-
     IObservableVector<Editor::Font> Appearances::FilteredFontList()
     {
         if (!_filteredFonts)
@@ -1444,15 +1423,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     safe_void_coroutine Appearances::BackgroundImage_Click(const IInspectable&, const RoutedEventArgs&)
     {
-        const auto lifetime = get_strong();
+        auto lifetime = get_strong();
 
-        const auto windowRoot = WindowRoot();
-        if (!windowRoot)
-        {
-            co_return;
-        }
-        const auto parentHwnd{ reinterpret_cast<HWND>(windowRoot.GetHostingWindow()) };
-        const auto file = co_await OpenImagePicker(parentHwnd);
+        const auto parentHwnd{ reinterpret_cast<HWND>(WindowRoot().GetHostingWindow()) };
+        auto file = co_await OpenImagePicker(parentHwnd);
         if (!file.empty())
         {
             Appearance().SetBackgroundImagePath(file);

src/cascadia/TerminalSettingsEditor/Appearances.h

@@ -188,14 +188,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     struct Appearances : AppearancesT<Appearances>
     {
         Appearances();
-        void BringIntoViewWhenLoaded(hstring elementToFocus);
 
         // CursorShape visibility logic
         bool IsVintageCursor() const;
 
-        Editor::IHostedInWindow WindowRoot() const noexcept { return _WeakWindowRoot.get(); }
-        void WindowRoot(const Editor::IHostedInWindow& value) noexcept { _WeakWindowRoot = value; }
-
         Windows::Foundation::Collections::IObservableVector<Editor::Font> FilteredFontList();
         bool ShowAllFonts() const noexcept;
         void ShowAllFonts(bool value);
@@ -214,7 +210,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool IsCustomFontWeight();
 
         til::property_changed_event PropertyChanged;
-        winrt::Windows::UI::Xaml::FrameworkElement::Loaded_revoker _loadedRevoker;
 
         WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::EnumEntry>, FontWeightList);
 
@@ -223,12 +218,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         DEPENDENCY_PROPERTY(Editor::AppearanceViewModel, Appearance);
         WINRT_PROPERTY(Editor::ProfileViewModel, SourceProfile, nullptr);
+        WINRT_PROPERTY(IHostedInWindow, WindowRoot, nullptr);
         GETSET_BINDABLE_ENUM_SETTING(BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch, Appearance().BackgroundImageStretchMode);
 
         GETSET_BINDABLE_ENUM_SETTING(IntenseTextStyle, Microsoft::Terminal::Settings::Model::IntenseStyle, Appearance().IntenseTextStyle);
 
     private:
-        winrt::weak_ref<Editor::IHostedInWindow> _WeakWindowRoot{ nullptr };
         Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _ViewModelChangedRevoker;
         std::array<Windows::UI::Xaml::Controls::Primitives::ToggleButton, 9> _BIAlignmentButtons;
         Windows::Foundation::Collections::IMap<uint16_t, Microsoft::Terminal::Settings::Editor::EnumEntry> _FontWeightMap;

src/cascadia/TerminalSettingsEditor/Appearances.xaml

@@ -75,8 +75,7 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
             <!--  Color Scheme  -->
             <!--  This currently only display the Dark color scheme, even if the user has a pair of schemes set.  -->
-            <local:SettingContainer x:Name="ColorScheme"
-                                    x:Uid="Profile_ColorScheme"
+            <local:SettingContainer x:Uid="Profile_ColorScheme"
                                     ClearSettingValue="{x:Bind Appearance.ClearColorScheme}"
                                     CurrentValueAccessibleName="{x:Bind Appearance.CurrentColorScheme.Name, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasDarkColorSchemeName, Mode=OneWay}"
@@ -285,20 +284,17 @@
                               IsChecked="{x:Bind ShowAllFonts, Mode=TwoWay}" />
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Name="MissingFontFaces"
-                                    x:Uid="Profile_MissingFontFaces"
+            <local:SettingContainer x:Uid="Profile_MissingFontFaces"
                                     HelpText="{x:Bind Appearance.MissingFontFaces, Mode=OneWay}"
                                     Style="{StaticResource SettingContainerErrorStyle}"
                                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.MissingFontFaces), Mode=OneWay}" />
-            <local:SettingContainer x:Name="ProportionalFontFaces"
-                                    x:Uid="Profile_ProportionalFontFaces"
+            <local:SettingContainer x:Uid="Profile_ProportionalFontFaces"
                                     HelpText="{x:Bind Appearance.ProportionalFontFaces, Mode=OneWay}"
                                     Style="{StaticResource SettingContainerWarningStyle}"
                                     Visibility="{x:Bind mtu:Converters.StringNotEmptyToVisibility(Appearance.ProportionalFontFaces), Mode=OneWay}" />
 
             <!--  Font Size  -->
-            <local:SettingContainer x:Name="FontSize"
-                                    x:Uid="Profile_FontSize"
+            <local:SettingContainer x:Uid="Profile_FontSize"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontSize}"
                                     HasSettingValue="{x:Bind Appearance.HasFontSize, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontSizeOverrideSource, Mode=OneWay}"
@@ -314,8 +310,7 @@
             </local:SettingContainer>
 
             <!--  Line Height  -->
-            <local:SettingContainer x:Name="LineHeight"
-                                    x:Uid="Profile_LineHeight"
+            <local:SettingContainer x:Uid="Profile_LineHeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearLineHeight}"
                                     HasSettingValue="{x:Bind Appearance.HasLineHeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.LineHeightOverrideSource, Mode=OneWay}"
@@ -331,8 +326,7 @@
             </local:SettingContainer>
 
             <!--  Cell Width  -->
-            <local:SettingContainer x:Name="CellWidth"
-                                    x:Uid="Profile_CellWidth"
+            <local:SettingContainer x:Uid="Profile_CellWidth"
                                     ClearSettingValue="{x:Bind Appearance.ClearCellWidth}"
                                     HasSettingValue="{x:Bind Appearance.HasCellWidth, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CellWidthOverrideSource, Mode=OneWay}"
@@ -348,8 +342,7 @@
             </local:SettingContainer>
 
             <!--  Font Weight  -->
-            <local:SettingContainer x:Name="FontWeight"
-                                    x:Uid="Profile_FontWeight"
+            <local:SettingContainer x:Uid="Profile_FontWeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontWeight}"
                                     HasSettingValue="{x:Bind Appearance.HasFontWeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontWeightOverrideSource, Mode=OneWay}"
@@ -385,8 +378,7 @@
                     </Grid>
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Name="FontAxes"
-                                    x:Uid="Profile_FontAxes"
+            <local:SettingContainer x:Uid="Profile_FontAxes"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontAxes}"
                                     HasSettingValue="{x:Bind Appearance.HasFontAxes, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontAxesOverrideSource, Mode=OneWay}"
@@ -413,8 +405,7 @@
                     </muxc:DropDownButton>
                 </StackPanel>
             </local:SettingContainer>
-            <local:SettingContainer x:Name="FontFeatures"
-                                    x:Uid="Profile_FontFeatures"
+            <local:SettingContainer x:Uid="Profile_FontFeatures"
                                     ClearSettingValue="{x:Bind Appearance.ClearFontFeatures}"
                                     HasSettingValue="{x:Bind Appearance.HasFontFeatures, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.FontFeaturesOverrideSource, Mode=OneWay}"
@@ -443,8 +434,7 @@
             </local:SettingContainer>
 
             <!--  Builtin Glyphs  -->
-            <local:SettingContainer x:Name="EnableBuiltinGlyphs"
-                                    x:Uid="Profile_EnableBuiltinGlyphs"
+            <local:SettingContainer x:Uid="Profile_EnableBuiltinGlyphs"
                                     ClearSettingValue="{x:Bind Appearance.ClearEnableBuiltinGlyphs}"
                                     HasSettingValue="{x:Bind Appearance.HasEnableBuiltinGlyphs, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.EnableBuiltinGlyphsOverrideSource, Mode=OneWay}">
@@ -453,8 +443,7 @@
             </local:SettingContainer>
 
             <!--  Color Glyphs  -->
-            <local:SettingContainer x:Name="EnableColorGlyphs"
-                                    x:Uid="Profile_EnableColorGlyphs"
+            <local:SettingContainer x:Uid="Profile_EnableColorGlyphs"
                                     ClearSettingValue="{x:Bind Appearance.ClearEnableColorGlyphs}"
                                     HasSettingValue="{x:Bind Appearance.HasEnableColorGlyphs, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.EnableColorGlyphsOverrideSource, Mode=OneWay}">
@@ -463,8 +452,7 @@
             </local:SettingContainer>
 
             <!--  Retro Terminal Effect  -->
-            <local:SettingContainer x:Name="RetroTerminalEffect"
-                                    x:Uid="Profile_RetroTerminalEffect"
+            <local:SettingContainer x:Uid="Profile_RetroTerminalEffect"
                                     ClearSettingValue="{x:Bind Appearance.ClearRetroTerminalEffect}"
                                     HasSettingValue="{x:Bind Appearance.HasRetroTerminalEffect, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.RetroTerminalEffectOverrideSource, Mode=OneWay}">
@@ -473,8 +461,7 @@
             </local:SettingContainer>
 
             <!--  Adjust Indistinguishable Colors  -->
-            <local:SettingContainer x:Name="AdjustIndistinguishableColors"
-                                    x:Uid="Profile_AdjustIndistinguishableColors"
+            <local:SettingContainer x:Uid="Profile_AdjustIndistinguishableColors"
                                     ClearSettingValue="{x:Bind Appearance.ClearAdjustIndistinguishableColors}"
                                     HasSettingValue="{x:Bind Appearance.HasAdjustIndistinguishableColors, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.AdjustIndistinguishableColorsOverrideSource, Mode=OneWay}">
@@ -492,8 +479,7 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Cursor Shape  -->
-            <local:SettingContainer x:Name="CursorShape"
-                                    x:Uid="Profile_CursorShape"
+            <local:SettingContainer x:Uid="Profile_CursorShape"
                                     ClearSettingValue="{x:Bind Appearance.ClearCursorShape}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorShape, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorShapeOverrideSource, Mode=OneWay}">
@@ -505,8 +491,7 @@
             </local:SettingContainer>
 
             <!--  Cursor Height  -->
-            <local:SettingContainer x:Name="CursorHeight"
-                                    x:Uid="Profile_CursorHeight"
+            <local:SettingContainer x:Uid="Profile_CursorHeight"
                                     ClearSettingValue="{x:Bind Appearance.ClearCursorHeight}"
                                     HasSettingValue="{x:Bind Appearance.HasCursorHeight, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.CursorHeightOverrideSource, Mode=OneWay}"
@@ -578,8 +563,7 @@
             </local:SettingContainer>
 
             <!--  Background Image Stretch Mode  -->
-            <local:SettingContainer x:Name="BackgroundImageStretchMode"
-                                    x:Uid="Profile_BackgroundImageStretchMode"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageStretchMode"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageStretchMode}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageStretchMode, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImageStretchModeOverrideSource, Mode=OneWay}"
@@ -592,8 +576,7 @@
             </local:SettingContainer>
 
             <!--  Background Image Alignment  -->
-            <local:SettingContainer x:Name="BackgroundImageAlignment"
-                                    x:Uid="Profile_BackgroundImageAlignment"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageAlignment"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageAlignment}"
                                     CurrentValue="{x:Bind Appearance.BackgroundImageAlignmentCurrentValue, Mode=OneWay}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageAlignment, Mode=OneWay}"
@@ -781,8 +764,7 @@
             </local:SettingContainer>
 
             <!--  Background Image Opacity  -->
-            <local:SettingContainer x:Name="BackgroundImageOpacity"
-                                    x:Uid="Profile_BackgroundImageOpacity"
+            <local:SettingContainer x:Uid="Profile_BackgroundImageOpacity"
                                     ClearSettingValue="{x:Bind Appearance.ClearBackgroundImageOpacity}"
                                     HasSettingValue="{x:Bind Appearance.HasBackgroundImageOpacity, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.BackgroundImageOpacityOverrideSource, Mode=OneWay}"
@@ -808,8 +790,7 @@
                        Style="{StaticResource TextBlockSubHeaderStyle}" />
 
             <!--  Intense is bold, bright  -->
-            <local:SettingContainer x:Name="IntenseTextStyle"
-                                    x:Uid="Appearance_IntenseTextStyle"
+            <local:SettingContainer x:Uid="Appearance_IntenseTextStyle"
                                     ClearSettingValue="{x:Bind Appearance.ClearIntenseTextStyle}"
                                     HasSettingValue="{x:Bind Appearance.HasIntenseTextStyle, Mode=OneWay}"
                                     SettingOverrideSource="{x:Bind Appearance.IntenseTextStyleOverrideSource, Mode=OneWay}">

src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp

@@ -33,10 +33,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void ColorSchemes::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ColorSchemesPageViewModel>();
+        _ViewModel = e.Parameter().as<Editor::ColorSchemesPageViewModel>();
         _ViewModel.CurrentPage(ColorSchemesSubPage::Base);
-        BringIntoViewWhenLoaded(args.ElementToFocus());
 
         _layoutUpdatedRevoker = LayoutUpdated(winrt::auto_revoke, [this](auto /*s*/, auto /*e*/) {
             // Only let this succeed once.

src/cascadia/TerminalSettingsEditor/Compatibility.cpp

@@ -16,7 +16,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _settings{ settings }
     {
         INITIALIZE_BINDABLE_ENUM_SETTING(TextMeasurement, TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, L"Globals_TextMeasurement_", L"Text");
-        INITIALIZE_BINDABLE_ENUM_SETTING(AmbiguousWidth, AmbiguousWidth, winrt::Microsoft::Terminal::Control::AmbiguousWidth, L"Globals_AmbiguousWidth_", L"Text");
     }
 
     bool CompatibilityViewModel::DebugFeaturesAvailable() const noexcept
@@ -55,9 +54,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Compatibility::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::CompatibilityViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::CompatibilityViewModel>();
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,

src/cascadia/TerminalSettingsEditor/Compatibility.h

@@ -25,8 +25,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), AllowHeadless);
         PERMANENT_OBSERVABLE_PROJECTED_SETTING(_settings.GlobalSettings(), DebugFeaturesEnabled);
-        GETSET_BINDABLE_ENUM_SETTING(TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, _settings.WindowSettingsDefaults().TextMeasurement);
-        GETSET_BINDABLE_ENUM_SETTING(AmbiguousWidth, winrt::Microsoft::Terminal::Control::AmbiguousWidth, _settings.WindowSettingsDefaults().AmbiguousWidth);
+        GETSET_BINDABLE_ENUM_SETTING(TextMeasurement, winrt::Microsoft::Terminal::Control::TextMeasurement, _settings.GlobalSettings().TextMeasurement);
 
     private:
         Model::CascadiaSettings _settings;

src/cascadia/TerminalSettingsEditor/Compatibility.idl

@@ -20,9 +20,6 @@ namespace Microsoft.Terminal.Settings.Editor
 
         IInspectable CurrentTextMeasurement;
         Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> TextMeasurementList { get; };
-
-        IInspectable CurrentAmbiguousWidth;
-        Windows.Foundation.Collections.IObservableVector<Microsoft.Terminal.Settings.Editor.EnumEntry> AmbiguousWidthList { get; };
     }
 
     [default_interface] runtimeclass Compatibility : Windows.UI.Xaml.Controls.Page

src/cascadia/TerminalSettingsEditor/Compatibility.xaml

@@ -26,15 +26,13 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Allow Headless  -->
-        <local:SettingContainer x:Name="AllowHeadless"
-                                x:Uid="Globals_AllowHeadless">
+        <local:SettingContainer x:Uid="Globals_AllowHeadless">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AllowHeadless, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Text Measurement  -->
-        <local:SettingContainer x:Name="TextMeasurement"
-                                x:Uid="Globals_TextMeasurement">
+        <local:SettingContainer x:Uid="Globals_TextMeasurement">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.TextMeasurementList}"
@@ -42,26 +40,15 @@
                       Style="{StaticResource ComboBoxSettingStyle}" />
         </local:SettingContainer>
 
-        <!--  Ambiguous Width  -->
-        <local:SettingContainer x:Uid="Globals_AmbiguousWidth">
-            <ComboBox AutomationProperties.AccessibilityView="Content"
-                      ItemTemplate="{StaticResource EnumComboBoxTemplate}"
-                      ItemsSource="{x:Bind ViewModel.AmbiguousWidthList}"
-                      SelectedItem="{x:Bind ViewModel.CurrentAmbiguousWidth, Mode=TwoWay}"
-                      Style="{StaticResource ComboBoxSettingStyle}" />
-        </local:SettingContainer>
-
         <!--  Debug Features  -->
-        <local:SettingContainer x:Name="DebugFeaturesEnabled"
-                                x:Uid="Globals_DebugFeaturesEnabled"
+        <local:SettingContainer x:Uid="Globals_DebugFeaturesEnabled"
                                 Visibility="{x:Bind ViewModel.DebugFeaturesAvailable}">
             <ToggleSwitch IsOn="{x:Bind ViewModel.DebugFeaturesEnabled, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Reset Application State  -->
-        <local:SettingContainer x:Name="ResetApplicationState"
-                                x:Uid="Settings_ResetApplicationState">
+        <local:SettingContainer x:Uid="Settings_ResetApplicationState">
             <Button x:Uid="Settings_ResetApplicationStateButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>
@@ -82,8 +69,7 @@
         </local:SettingContainer>
 
         <!--  Reset to Default Settings  -->
-        <local:SettingContainer x:Name="ResetToDefaultSettings"
-                                x:Uid="Settings_ResetToDefaultSettings">
+        <local:SettingContainer x:Uid="Settings_ResetToDefaultSettings">
             <Button x:Uid="Settings_ResetToDefaultSettingsButton"
                     Style="{StaticResource DeleteButtonStyle}">
                 <Button.Flyout>

src/cascadia/TerminalSettingsEditor/EditAction.cpp

@@ -8,9 +8,7 @@
 #include "../TerminalSettingsModel/AllShortcutActions.h"
 
 using namespace winrt::Windows::UI::Xaml;
-using namespace winrt::Windows::UI::Xaml::Controls;
 using namespace winrt::Windows::UI::Xaml::Navigation;
-using namespace winrt::Windows::Foundation::Collections;
 
 namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 {
@@ -20,8 +18,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void EditAction::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::CommandViewModel>();
+        const auto args = e.Parameter().as<Editor::NavigateToCommandArgs>();
+        _ViewModel = args.Command();
         _propagateWindowRootRevoker = _ViewModel.PropagateWindowRootRequested(
             winrt::auto_revoke,
             [windowRoot = args.WindowRoot()](const IInspectable&, const Editor::ArgWrapper& wrapper) {
@@ -38,9 +36,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                 {
                     if (auto kcVM{ args.try_as<KeyChordViewModel>() })
                     {
-                        // Force a layout update in case this key chord was newly added
-                        page->KeyChordListView().ScrollIntoView(*kcVM);
-                        page->KeyChordListView().UpdateLayout();
                         if (const auto& container = page->KeyChordListView().ContainerFromItem(*kcVM))
                         {
                             container.as<Controls::ListViewItem>().Focus(FocusState::Programmatic);
@@ -54,86 +49,5 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
             CommandNameTextBox().Focus(FocusState::Programmatic);
         });
-
-        // Initialize AutoSuggestBox with current action and store last valid action
-        if (_ViewModel.ProposedShortcutActionName())
-        {
-            const auto currentAction = winrt::unbox_value<winrt::hstring>(_ViewModel.ProposedShortcutActionName());
-            ShortcutActionBox().Text(currentAction);
-            _lastValidAction = currentAction;
-        }
-    }
-
-    void EditAction::ShortcutActionBox_GotFocus(const IInspectable& sender, const RoutedEventArgs&)
-    {
-        // Only rebuild the list if we don't have a cached list or if the cached list is filtered
-        if (!_filteredActions || !_currentActionFilter.empty())
-        {
-            // Open the suggestions list with all available actions
-            std::vector<winrt::hstring> allActions;
-            for (const auto& action : _ViewModel.AvailableShortcutActions())
-            {
-                allActions.push_back(action);
-            }
-
-            _filteredActions = winrt::single_threaded_observable_vector(std::move(allActions));
-            _currentActionFilter = L"";
-            sender.as<AutoSuggestBox>().ItemsSource(_filteredActions);
-        }
-        sender.as<AutoSuggestBox>().IsSuggestionListOpen(true);
-    }
-
-    void EditAction::ShortcutActionBox_TextChanged(const AutoSuggestBox& sender, const AutoSuggestBoxTextChangedEventArgs& args)
-    {
-        if (args.Reason() == AutoSuggestionBoxTextChangeReason::UserInput)
-        {
-            const auto searchText = sender.Text();
-            std::vector<winrt::hstring> filtered;
-
-            for (const auto& action : _ViewModel.AvailableShortcutActions())
-            {
-                // TODO: Update this to use fzf later
-                if (til::contains_linguistic_insensitive(action, searchText))
-                {
-                    filtered.push_back(action);
-                }
-            }
-
-            _filteredActions = winrt::single_threaded_observable_vector(std::move(filtered));
-            _currentActionFilter = searchText;
-            sender.ItemsSource(_filteredActions);
-        }
-    }
-
-    void EditAction::ShortcutActionBox_QuerySubmitted(const AutoSuggestBox& sender, const AutoSuggestBoxQuerySubmittedEventArgs& args)
-    {
-        const auto submittedText = args.QueryText();
-
-        for (const auto& action : _ViewModel.AvailableShortcutActions())
-        {
-            if (action == submittedText)
-            {
-                _ViewModel.ProposedShortcutActionName(winrt::box_value(submittedText));
-                _lastValidAction = submittedText;
-                return;
-            }
-        }
-
-        // If we get here, we never found a match.
-        // Revert to the last valid action
-        sender.Text(_lastValidAction);
-    }
-
-    void EditAction::ShortcutActionBox_LostFocus(const IInspectable& sender, const RoutedEventArgs&)
-    {
-        // The auto suggest box does a weird thing where it reverts to the last query text when you
-        // keyboard navigate out of it. Intercept it here and keep the correct text.
-        const auto box = sender.as<AutoSuggestBox>();
-        const auto currentText = box.Text();
-
-        if (currentText != _lastValidAction && !_lastValidAction.empty())
-        {
-            box.Text(_lastValidAction);
-        }
     }
 }

src/cascadia/TerminalSettingsEditor/EditAction.h

@@ -20,19 +20,11 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
         WINRT_OBSERVABLE_PROPERTY(Editor::CommandViewModel, ViewModel, PropertyChanged.raise, nullptr);
 
-        void ShortcutActionBox_GotFocus(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& args);
-        void ShortcutActionBox_TextChanged(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxTextChangedEventArgs& args);
-        void ShortcutActionBox_QuerySubmitted(const winrt::Windows::UI::Xaml::Controls::AutoSuggestBox& sender, const winrt::Windows::UI::Xaml::Controls::AutoSuggestBoxQuerySubmittedEventArgs& args);
-        void ShortcutActionBox_LostFocus(const winrt::Windows::Foundation::IInspectable& sender, const winrt::Windows::UI::Xaml::RoutedEventArgs& args);
-
     private:
         friend struct EditActionT<EditAction>; // for Xaml to bind events
         winrt::Windows::UI::Xaml::FrameworkElement::LayoutUpdated_revoker _layoutUpdatedRevoker;
         Editor::CommandViewModel::PropagateWindowRootRequested_revoker _propagateWindowRootRevoker;
         Editor::CommandViewModel::FocusContainer_revoker _focusContainerRevoker;
-        winrt::Windows::Foundation::Collections::IObservableVector<winrt::hstring> _filteredActions{ nullptr };
-        winrt::hstring _lastValidAction;
-        winrt::hstring _currentActionFilter;
     };
 }
 

src/cascadia/TerminalSettingsEditor/EditAction.xaml

@@ -136,7 +136,7 @@
             </Style>
             <Style x:Key="KeyChordEditorStyle"
                    TargetType="local:KeyChordListener">
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
+                <Setter Property="HorizontalAlignment" Value="Left" />
                 <Setter Property="VerticalAlignment" Value="Center" />
             </Style>
             <x:Int32 x:Key="EditButtonSize">32</x:Int32>
@@ -157,64 +157,63 @@
                 <Setter Property="Height" Value="{StaticResource EditButtonSize}" />
                 <Setter Property="Width" Value="{StaticResource EditButtonSize}" />
             </Style>
-            <Style x:Key="TextBlockGroupingStyle"
-                   BasedOn="{StaticResource BodyStrongTextBlockStyle}"
-                   TargetType="TextBlock">
-                <Setter Property="MaxWidth" Value="{StaticResource StandardControlMaxWidth}" />
-                <Setter Property="Margin" Value="0,0,0,4" />
-                <Setter Property="FontSize" Value="16" />
-            </Style>
 
             <!--  Templates  -->
             <DataTemplate x:Key="KeyChordTemplate"
                           x:DataType="local:KeyChordViewModel">
                 <ListViewItem IsTabStop="False"
                               Style="{StaticResource KeyBindingContainerStyle}">
-                    <Grid Padding="-4,0,0,0"
+                    <Grid Padding="2,0,2,0"
                           VerticalAlignment="Center">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                            <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <Button Grid.Column="0"
-                                Background="{ThemeResource AppBarItemBackgroundThemeBrush}"
                                 Click="{x:Bind ToggleEditMode}"
+                                Style="{ThemeResource KeyChordBorderStyle}"
                                 Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(IsInEditMode), Mode=OneWay}">
                             <TextBlock FontSize="14"
+                                       Style="{ThemeResource KeyChordTextBlockStyle}"
                                        Text="{x:Bind KeyChordText, Mode=OneWay}"
                                        TextWrapping="WrapWholeWords" />
                         </Button>
-                        <local:KeyChordListener Grid.Column="0"
-                                                Keys="{x:Bind ProposedKeys, Mode=TwoWay}"
-                                                Style="{StaticResource KeyChordEditorStyle}"
-                                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}" />
-                        <Button x:Uid="Actions_CancelButton"
-                                Grid.Column="1"
+                        <Grid Grid.Column="0"
+                              ColumnSpacing="8"
+                              Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <!--  Edit Mode: Key Chord Listener  -->
+                            <local:KeyChordListener Grid.Column="0"
+                                                    Keys="{x:Bind ProposedKeys, Mode=TwoWay}"
+                                                    Style="{StaticResource KeyChordEditorStyle}" />
+
+                            <!--  Cancel editing the action  -->
+                            <Button x:Uid="Actions_CancelButton"
+                                    Grid.Column="1"
+                                    AutomationProperties.Name="{x:Bind CancelButtonName}"
+                                    Click="{x:Bind CancelChanges}"
+                                    Style="{StaticResource EditButtonStyle}">
+                                <FontIcon FontSize="{StaticResource EditButtonIconSize}"
+                                          Glyph="&#xE711;" />
+                            </Button>
+
+                            <!--  Accept changes  -->
+                            <Button x:Uid="Actions_AcceptButton"
+                                    Grid.Column="2"
+                                    AutomationProperties.Name="{x:Bind AcceptButtonName}"
+                                    Click="{x:Bind AcceptChanges}"
+                                    Flyout="{x:Bind AcceptChangesFlyout, Mode=OneWay}"
+                                    Style="{StaticResource AccentEditButtonStyle}">
+                                <FontIcon FontSize="{StaticResource EditButtonIconSize}"
+                                          Glyph="&#xE8FB;" />
+                            </Button>
+                        </Grid>
+                        <Button Grid.Column="1"
                                 Margin="8,0,0,0"
-                                AutomationProperties.Name="{x:Bind CancelButtonName}"
-                                Click="{x:Bind CancelChanges}"
-                                Style="{StaticResource EditButtonStyle}"
-                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
-                            <FontIcon FontSize="{StaticResource EditButtonIconSize}"
-                                      Glyph="&#xE711;" />
-                        </Button>
-
-                        <Button x:Uid="Actions_AcceptButton"
-                                Grid.Column="2"
-                                Margin="8,0,8,0"
-                                AutomationProperties.Name="{x:Bind AcceptButtonName}"
-                                Click="{x:Bind AcceptChanges}"
-                                Flyout="{x:Bind AcceptChangesFlyout, Mode=OneWay}"
-                                Style="{StaticResource AccentEditButtonStyle}"
-                                Visibility="{x:Bind IsInEditMode, Mode=OneWay}">
-                            <FontIcon FontSize="{StaticResource EditButtonIconSize}"
-                                      Glyph="&#xE8FB;" />
-                        </Button>
-
-                        <Button Grid.Column="3"
-                                HorizontalAlignment="Left"
                                 AutomationProperties.Name="{x:Bind DeleteButtonName}"
                                 Style="{StaticResource DeleteSmallButtonStyle}">
                             <Button.Content>
@@ -244,14 +243,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="100"
@@ -269,14 +267,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -294,14 +291,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -319,14 +315,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -344,14 +339,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="1"
                                     Maximum="999"
@@ -369,14 +363,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <muxc:NumberBox Grid.Column="1"
-                                    HorizontalAlignment="Stretch"
                                     AutomationProperties.Name="{x:Bind Name}"
                                     LargeChange="0.2"
                                     Maximum="1"
@@ -394,7 +387,7 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*"
+                        <ColumnDefinition Width="Auto"
                                           MinWidth="196" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
@@ -415,14 +408,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <ComboBox Grid.Column="1"
-                              HorizontalAlignment="Stretch"
                               AutomationProperties.Name="{x:Bind Name}"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                               ItemsSource="{x:Bind EnumList, Mode=OneWay}"
@@ -490,14 +482,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <ToggleSwitch Grid.Column="1"
-                                  HorizontalAlignment="Left"
                                   AutomationProperties.Name="{x:Bind Name}"
                                   IsOn="{x:Bind UnboxBool(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}" />
                 </Grid>
@@ -510,14 +501,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <CheckBox Grid.Column="1"
-                              HorizontalAlignment="Left"
                               AutomationProperties.Name="{x:Bind Name}"
                               IsChecked="{x:Bind UnboxBoolOptional(Value), Mode=TwoWay, BindBack=BoolOptionalBindBack}"
                               IsThreeState="True" />
@@ -536,14 +526,13 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
                                Text="{x:Bind Name}"
                                TextWrapping="WrapWholeWords" />
                     <ComboBox Grid.Column="1"
-                              HorizontalAlignment="Stretch"
                               AutomationProperties.Name="{x:Bind Name}"
                               ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                               ItemsSource="{x:Bind EnumList, Mode=OneWay}"
@@ -597,7 +586,7 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
@@ -619,7 +608,7 @@
                       ColumnSpacing="8">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
-                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <TextBlock Grid.Column="0"
                                VerticalAlignment="Center"
@@ -657,98 +646,73 @@
 
     <Border MaxWidth="{StaticResource StandardControlMaxWidth}"
             Margin="{StaticResource SettingStackMargin}">
-        <Grid Margin="{StaticResource SettingStackMargin}"
-              HorizontalAlignment="Stretch">
+        <Grid MaxWidth="600"
+              Margin="{StaticResource SettingStackMargin}"
+              HorizontalAlignment="Left"
+              ColumnSpacing="16"
+              RowSpacing="8">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="{StaticResource ArgumentNameWidth}" />
+                <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
-            <TextBlock x:Uid="Actions_CommandDetails"
+            <TextBlock x:Uid="Actions_Name"
                        Grid.Row="0"
                        Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}" />
-            <TextBlock x:Uid="Actions_Name"
-                       Grid.Row="1"
-                       Grid.Column="0"
-                       Margin="0,0,0,8"
                        VerticalAlignment="Center" />
             <TextBox x:Name="CommandNameTextBox"
-                     Grid.Row="1"
+                     Grid.Row="0"
                      Grid.Column="1"
-                     Margin="0,0,0,8"
-                     HorizontalAlignment="Stretch"
+                     Width="300"
+                     HorizontalAlignment="Left"
                      AutomationProperties.Name="{x:Bind ViewModel.ActionNameTextBoxAutomationPropName}"
                      PlaceholderText="{x:Bind ViewModel.DisplayName, Mode=OneWay}"
                      Text="{x:Bind ViewModel.Name, Mode=TwoWay}" />
             <TextBlock x:Uid="Actions_ShortcutAction"
+                       Grid.Row="1"
+                       Grid.Column="0"
+                       VerticalAlignment="Center" />
+            <ComboBox Grid.Row="1"
+                      Grid.Column="1"
+                      VerticalAlignment="Center"
+                      AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
+                      ItemsSource="{x:Bind ViewModel.AvailableShortcutActions, Mode=OneWay}"
+                      SelectedItem="{x:Bind ViewModel.ProposedShortcutActionName, Mode=TwoWay}" />
+            <TextBlock x:Uid="Actions_Arguments"
                        Grid.Row="2"
                        Grid.Column="0"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center" />
-            <AutoSuggestBox x:Name="ShortcutActionBox"
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            Margin="0,0,0,12"
-                            VerticalAlignment="Center"
-                            AutomationProperties.Name="{x:Bind ViewModel.ShortcutActionComboBoxAutomationPropName}"
-                            GotFocus="ShortcutActionBox_GotFocus"
-                            LostFocus="ShortcutActionBox_LostFocus"
-                            QuerySubmitted="ShortcutActionBox_QuerySubmitted"
-                            TextChanged="ShortcutActionBox_TextChanged" />
-            <TextBlock x:Uid="Actions_Keybindings"
-                       Grid.Row="3"
-                       Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
                        VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}" />
-            <ListView x:Name="KeyChordListView"
-                      x:Uid="Actions_KeyBindingsListView"
-                      Grid.Row="4"
-                      Grid.Column="0"
-                      Grid.ColumnSpan="2"
-                      Margin="0,0,0,12"
-                      ItemTemplate="{StaticResource KeyChordTemplate}"
-                      ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
-                      SelectionMode="None">
-                <ListView.Footer>
-                    <Button Margin="0,4,0,0"
-                            Click="{x:Bind ViewModel.AddKeybinding_Click}">
-                        <TextBlock x:Uid="Actions_AddKeyChord" />
-                    </Button>
-                </ListView.Footer>
-            </ListView>
-            <TextBlock x:Uid="Actions_Arguments"
-                       Grid.Row="5"
-                       Grid.Column="0"
-                       Grid.ColumnSpan="2"
-                       Margin="0,0,0,12"
-                       VerticalAlignment="Center"
-                       Style="{StaticResource TextBlockGroupingStyle}"
                        Visibility="{x:Bind ViewModel.ActionArgsVM.HasArgs, Mode=OneWay}" />
-            <ItemsControl Grid.Row="6"
-                          Grid.Column="0"
-                          Grid.ColumnSpan="2"
-                          Margin="0,0,0,12"
-                          HorizontalAlignment="Stretch"
+            <ItemsControl Grid.Row="2"
+                          Grid.Column="1"
                           AutomationProperties.Name="{x:Bind ViewModel.AdditionalArgumentsControlAutomationPropName}"
                           IsTabStop="False"
                           ItemTemplateSelector="{StaticResource ArgsTemplateSelector}"
                           ItemsSource="{x:Bind ViewModel.ActionArgsVM.ArgValues, Mode=OneWay}" />
-            <Button Grid.Row="7"
+            <TextBlock x:Uid="Actions_Keybindings"
+                       Grid.Row="3"
+                       Grid.Column="0"
+                       VerticalAlignment="Center" />
+            <ListView x:Name="KeyChordListView"
+                      x:Uid="Actions_KeyBindingsListView"
+                      Grid.Row="3"
+                      Grid.Column="1"
+                      ItemTemplate="{StaticResource KeyChordTemplate}"
+                      ItemsSource="{x:Bind ViewModel.KeyChordList, Mode=OneWay}"
+                      SelectionMode="None">
+                <ListView.Header>
+                    <Button Click="{x:Bind ViewModel.AddKeybinding_Click}">
+                        <TextBlock x:Uid="Actions_AddKeyChord" />
+                    </Button>
+                </ListView.Header>
+            </ListView>
+            <Button Grid.Row="4"
                     Grid.Column="0"
                     IsEnabled="{x:Bind ViewModel.IsUserAction, Mode=OneWay}"
                     Style="{StaticResource DeleteButtonStyle}">

src/cascadia/TerminalSettingsEditor/EditColorScheme.cpp

@@ -38,9 +38,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void EditColorScheme::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ColorSchemeViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::ColorSchemeViewModel>();
 
         const auto schemeName = _ViewModel.Name();
         NameBox().Text(schemeName);

src/cascadia/TerminalSettingsEditor/EditColorScheme.xaml

@@ -200,8 +200,7 @@
             </Grid>
         </Border>
 
-        <local:SettingContainer x:Name="InboxSchemeDuplicate"
-                                x:Uid="ColorScheme_InboxSchemeDuplicate"
+        <local:SettingContainer x:Uid="ColorScheme_InboxSchemeDuplicate"
                                 Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.IsEditable), Mode=OneWay}">
             <Button x:Name="DuplicateSchemeButton"
                     x:Uid="ColorScheme_DuplicateButton"
@@ -209,8 +208,7 @@
                     Style="{StaticResource BrowseButtonStyle}" />
         </local:SettingContainer>
 
-        <local:SettingContainer x:Name="ColorsHeader"
-                                x:Uid="ColorScheme_ColorsHeader"
+        <local:SettingContainer x:Uid="ColorScheme_ColorsHeader"
                                 StartExpanded="True"
                                 Style="{StaticResource ExpanderSettingContainerStyle}"
                                 Visibility="{x:Bind ViewModel.IsEditable, Mode=OneWay}">

src/cascadia/TerminalSettingsEditor/Extensions.cpp

@@ -8,7 +8,6 @@
 #include "ExtensionsViewModel.g.cpp"
 #include "FragmentProfileViewModel.g.cpp"
 #include "ExtensionPackageTemplateSelector.g.cpp"
-#include "NavConstants.h"
 
 #include "..\WinRTUtils\inc\Utils.h"
 
@@ -34,17 +33,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void Extensions::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::ExtensionsViewModel>();
-
-        // The extensions are loaded asynchronously as a part of the VM ctor.
-        // However, there's a chance that they aren't done loading yet.
-        // Calling LoadExtensions() ensures they're loaded by the time we try to display them, and it won't do anything if they're already loaded.
+        _ViewModel = e.Parameter().as<Editor::ExtensionsViewModel>();
         auto vmImpl = get_self<ExtensionsViewModel>(_ViewModel);
-        vmImpl->LoadExtensions();
         vmImpl->ExtensionPackageIdentifierTemplateSelector(_extensionPackageIdentifierTemplateSelector);
-
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        vmImpl->LazyLoadExtensions();
 
         if (vmImpl->IsExtensionView())
         {
@@ -97,10 +89,10 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     ExtensionsViewModel::ExtensionsViewModel(const Model::CascadiaSettings& settings, const Editor::ColorSchemesPageViewModel& colorSchemesPageVM) :
         _settings{ settings },
-        _colorSchemesPageVM{ colorSchemesPageVM }
+        _colorSchemesPageVM{ colorSchemesPageVM },
+        _extensionsLoaded{ false }
     {
         UpdateSettings(settings, colorSchemesPageVM);
-        _LoadExtensionsAsync();
 
         PropertyChanged([this](auto&&, const PropertyChangedEventArgs& args) {
             const auto viewModelProperty{ args.PropertyName() };
@@ -220,7 +212,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         _CurrentExtensionPackage = nullptr;
 
         // The extension packages may not be loaded yet because we want to wait until we actually navigate to the page to do so.
-        // In that case, omit "updating" them. They'll get the proper references when we load them.
+        // In that case, omit "updating" them. They'll get the proper references when we lazy load them.
         if (_extensionPackages)
         {
             for (const auto& extPkg : _extensionPackages)
@@ -230,146 +222,139 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
-    safe_void_coroutine ExtensionsViewModel::_LoadExtensionsAsync()
+    void ExtensionsViewModel::LazyLoadExtensions()
     {
-        auto weakThis = get_weak();
-        co_await winrt::resume_background();
-        if (auto strongThis = weakThis.get())
+        if (_extensionsLoaded)
         {
-            strongThis->LoadExtensions();
+            return;
         }
-    }
+        std::vector<Model::ExtensionPackage> extensions = wil::to_vector(_settings.Extensions());
 
-    void ExtensionsViewModel::LoadExtensions()
-    {
-        std::call_once(_extensionsLoaded, [this]() {
-            std::vector<Model::ExtensionPackage> extensions = wil::to_vector(_settings.Extensions());
-
-            // these vectors track components all extensions successfully added
-            std::vector<Editor::ExtensionPackageViewModel> extensionPackages;
-            std::vector<Editor::FragmentProfileViewModel> profilesModifiedTotal;
-            std::vector<Editor::FragmentProfileViewModel> profilesAddedTotal;
-            std::vector<Editor::FragmentColorSchemeViewModel> colorSchemesAddedTotal;
-            for (const auto& extPkg : extensions)
+        // these vectors track components all extensions successfully added
+        std::vector<Editor::ExtensionPackageViewModel> extensionPackages;
+        std::vector<Editor::FragmentProfileViewModel> profilesModifiedTotal;
+        std::vector<Editor::FragmentProfileViewModel> profilesAddedTotal;
+        std::vector<Editor::FragmentColorSchemeViewModel> colorSchemesAddedTotal;
+        for (const auto& extPkg : extensions)
+        {
+            auto extPkgVM = winrt::make_self<ExtensionPackageViewModel>(extPkg, _settings);
+            for (const auto& fragExt : extPkg.FragmentsView())
             {
-                auto extPkgVM = winrt::make_self<ExtensionPackageViewModel>(extPkg, _settings);
-                for (const auto& fragExt : extPkg.FragmentsView())
+                const auto extensionEnabled = GetExtensionState(fragExt.Source(), _settings);
+
+                // these vectors track everything the current extension attempted to bring in
+                std::vector<Editor::FragmentProfileViewModel> currentProfilesModified;
+                std::vector<Editor::FragmentProfileViewModel> currentProfilesAdded;
+                std::vector<Editor::FragmentColorSchemeViewModel> currentColorSchemesAdded;
+
+                if (fragExt.ModifiedProfilesView())
                 {
-                    const auto extensionEnabled = GetExtensionState(fragExt.Source(), _settings);
-
-                    // these vectors track everything the current extension attempted to bring in
-                    std::vector<Editor::FragmentProfileViewModel> currentProfilesModified;
-                    std::vector<Editor::FragmentProfileViewModel> currentProfilesAdded;
-                    std::vector<Editor::FragmentColorSchemeViewModel> currentColorSchemesAdded;
-
-                    if (fragExt.ModifiedProfilesView())
+                    for (const auto&& entry : fragExt.ModifiedProfilesView())
                     {
-                        for (const auto&& entry : fragExt.ModifiedProfilesView())
+                        // Ensure entry successfully modifies a profile before creating and registering the object
+                        if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
                         {
-                            // Ensure entry successfully modifies a profile before creating and registering the object
-                            if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
+                            auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
+                            currentProfilesModified.push_back(vm);
+                            if (extensionEnabled)
                             {
-                                auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
-                                currentProfilesModified.push_back(vm);
-                                if (extensionEnabled)
-                                {
-                                    profilesModifiedTotal.push_back(vm);
-                                }
+                                profilesModifiedTotal.push_back(vm);
                             }
                         }
                     }
-
-                    if (fragExt.NewProfilesView())
-                    {
-                        for (const auto&& entry : fragExt.NewProfilesView())
-                        {
-                            // Ensure entry successfully points to a profile before creating and registering the object.
-                            // The profile may have been removed by the user.
-                            if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
-                            {
-                                auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
-                                currentProfilesAdded.push_back(vm);
-                                if (extensionEnabled)
-                                {
-                                    profilesAddedTotal.push_back(vm);
-                                }
-                            }
-                        }
-                    }
-
-                    if (fragExt.ColorSchemesView())
-                    {
-                        for (const auto&& entry : fragExt.ColorSchemesView())
-                        {
-                            for (const auto& schemeVM : _colorSchemesPageVM.AllColorSchemes())
-                            {
-                                if (schemeVM.Name() == entry.ColorSchemeName())
-                                {
-                                    auto vm = winrt::make<FragmentColorSchemeViewModel>(entry, fragExt, schemeVM);
-                                    currentColorSchemesAdded.push_back(vm);
-                                    if (extensionEnabled)
-                                    {
-                                        colorSchemesAddedTotal.push_back(vm);
-                                    }
-                                }
-                            }
-                        }
-                    }
-
-                    // sort the lists linguistically for nicer presentation
-                    std::sort(currentProfilesModified.begin(), currentProfilesModified.end(), FragmentProfileViewModel::SortAscending);
-                    std::sort(currentProfilesAdded.begin(), currentProfilesAdded.end(), FragmentProfileViewModel::SortAscending);
-                    std::sort(currentColorSchemesAdded.begin(), currentColorSchemesAdded.end(), FragmentColorSchemeViewModel::SortAscending);
-
-                    extPkgVM->FragmentExtensions().Append(winrt::make<FragmentExtensionViewModel>(fragExt, currentProfilesModified, currentProfilesAdded, currentColorSchemesAdded));
-                    extPkgVM->PropertyChanged([&](const IInspectable& sender, const PropertyChangedEventArgs& args) {
-                        const auto viewModelProperty{ args.PropertyName() };
-                        if (viewModelProperty == L"Enabled")
-                        {
-                            // If the extension was enabled/disabled,
-                            // check if any of its fragments modified profiles, added profiles, or added color schemes.
-                            // Only notify what was affected!
-                            bool hasModifiedProfiles = false;
-                            bool hasAddedProfiles = false;
-                            bool hasAddedColorSchemes = false;
-                            for (const auto& fragExtVM : sender.as<ExtensionPackageViewModel>()->FragmentExtensions())
-                            {
-                                const auto profilesModified = fragExtVM.ProfilesModified();
-                                const auto profilesAdded = fragExtVM.ProfilesAdded();
-                                const auto colorSchemesAdded = fragExtVM.ColorSchemesAdded();
-                                hasModifiedProfiles |= profilesModified && profilesModified.Size() > 0;
-                                hasAddedProfiles |= profilesAdded && profilesAdded.Size() > 0;
-                                hasAddedColorSchemes |= colorSchemesAdded && colorSchemesAdded.Size() > 0;
-                            }
-                            if (hasModifiedProfiles)
-                            {
-                                _NotifyChanges(L"ProfilesModified");
-                            }
-                            if (hasAddedProfiles)
-                            {
-                                _NotifyChanges(L"ProfilesAdded");
-                            }
-                            if (hasAddedColorSchemes)
-                            {
-                                _NotifyChanges(L"ColorSchemesAdded");
-                            }
-                        }
-                    });
                 }
-                extensionPackages.push_back(*extPkgVM);
+
+                if (fragExt.NewProfilesView())
+                {
+                    for (const auto&& entry : fragExt.NewProfilesView())
+                    {
+                        // Ensure entry successfully points to a profile before creating and registering the object.
+                        // The profile may have been removed by the user.
+                        if (const auto& deducedProfile = _settings.FindProfile(entry.ProfileGuid()))
+                        {
+                            auto vm = winrt::make<FragmentProfileViewModel>(entry, fragExt, deducedProfile);
+                            currentProfilesAdded.push_back(vm);
+                            if (extensionEnabled)
+                            {
+                                profilesAddedTotal.push_back(vm);
+                            }
+                        }
+                    }
+                }
+
+                if (fragExt.ColorSchemesView())
+                {
+                    for (const auto&& entry : fragExt.ColorSchemesView())
+                    {
+                        for (const auto& schemeVM : _colorSchemesPageVM.AllColorSchemes())
+                        {
+                            if (schemeVM.Name() == entry.ColorSchemeName())
+                            {
+                                auto vm = winrt::make<FragmentColorSchemeViewModel>(entry, fragExt, schemeVM);
+                                currentColorSchemesAdded.push_back(vm);
+                                if (extensionEnabled)
+                                {
+                                    colorSchemesAddedTotal.push_back(vm);
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // sort the lists linguistically for nicer presentation
+                std::sort(currentProfilesModified.begin(), currentProfilesModified.end(), FragmentProfileViewModel::SortAscending);
+                std::sort(currentProfilesAdded.begin(), currentProfilesAdded.end(), FragmentProfileViewModel::SortAscending);
+                std::sort(currentColorSchemesAdded.begin(), currentColorSchemesAdded.end(), FragmentColorSchemeViewModel::SortAscending);
+
+                extPkgVM->FragmentExtensions().Append(winrt::make<FragmentExtensionViewModel>(fragExt, currentProfilesModified, currentProfilesAdded, currentColorSchemesAdded));
+                extPkgVM->PropertyChanged([&](const IInspectable& sender, const PropertyChangedEventArgs& args) {
+                    const auto viewModelProperty{ args.PropertyName() };
+                    if (viewModelProperty == L"Enabled")
+                    {
+                        // If the extension was enabled/disabled,
+                        // check if any of its fragments modified profiles, added profiles, or added color schemes.
+                        // Only notify what was affected!
+                        bool hasModifiedProfiles = false;
+                        bool hasAddedProfiles = false;
+                        bool hasAddedColorSchemes = false;
+                        for (const auto& fragExtVM : sender.as<ExtensionPackageViewModel>()->FragmentExtensions())
+                        {
+                            const auto profilesModified = fragExtVM.ProfilesModified();
+                            const auto profilesAdded = fragExtVM.ProfilesAdded();
+                            const auto colorSchemesAdded = fragExtVM.ColorSchemesAdded();
+                            hasModifiedProfiles |= profilesModified && profilesModified.Size() > 0;
+                            hasAddedProfiles |= profilesAdded && profilesAdded.Size() > 0;
+                            hasAddedColorSchemes |= colorSchemesAdded && colorSchemesAdded.Size() > 0;
+                        }
+                        if (hasModifiedProfiles)
+                        {
+                            _NotifyChanges(L"ProfilesModified");
+                        }
+                        if (hasAddedProfiles)
+                        {
+                            _NotifyChanges(L"ProfilesAdded");
+                        }
+                        if (hasAddedColorSchemes)
+                        {
+                            _NotifyChanges(L"ColorSchemesAdded");
+                        }
+                    }
+                });
             }
+            extensionPackages.push_back(*extPkgVM);
+        }
 
-            // sort the lists linguistically for nicer presentation
-            std::sort(extensionPackages.begin(), extensionPackages.end(), ExtensionPackageViewModel::SortAscending);
-            std::sort(profilesModifiedTotal.begin(), profilesModifiedTotal.end(), FragmentProfileViewModel::SortAscending);
-            std::sort(profilesAddedTotal.begin(), profilesAddedTotal.end(), FragmentProfileViewModel::SortAscending);
-            std::sort(colorSchemesAddedTotal.begin(), colorSchemesAddedTotal.end(), FragmentColorSchemeViewModel::SortAscending);
+        // sort the lists linguistically for nicer presentation
+        std::sort(extensionPackages.begin(), extensionPackages.end(), ExtensionPackageViewModel::SortAscending);
+        std::sort(profilesModifiedTotal.begin(), profilesModifiedTotal.end(), FragmentProfileViewModel::SortAscending);
+        std::sort(profilesAddedTotal.begin(), profilesAddedTotal.end(), FragmentProfileViewModel::SortAscending);
+        std::sort(colorSchemesAddedTotal.begin(), colorSchemesAddedTotal.end(), FragmentColorSchemeViewModel::SortAscending);
 
-            _extensionPackages = single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(std::move(extensionPackages));
-            _profilesModifiedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesModifiedTotal));
-            _profilesAddedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesAddedTotal));
-            _colorSchemesAddedView = single_threaded_observable_vector<Editor::FragmentColorSchemeViewModel>(std::move(colorSchemesAddedTotal));
-        });
+        _extensionPackages = single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(std::move(extensionPackages));
+        _profilesModifiedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesModifiedTotal));
+        _profilesAddedView = single_threaded_observable_vector<Editor::FragmentProfileViewModel>(std::move(profilesAddedTotal));
+        _colorSchemesAddedView = single_threaded_observable_vector<Editor::FragmentColorSchemeViewModel>(std::move(colorSchemesAddedTotal));
+        _extensionsLoaded = true;
     }
 
     Windows::UI::Xaml::DataTemplate ExtensionsViewModel::CurrentExtensionPackageIdentifierTemplate() const
@@ -467,20 +452,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         }
     }
 
-    hstring ExtensionPackageViewModel::DisplayName() const noexcept
-    {
-        // Fragment extensions may not have a DisplayName, so fall back to Source
-        const auto displayName = _package.DisplayName();
-        return displayName.empty() ? _package.Source() : displayName;
-    }
-
-    hstring ExtensionPackageViewModel::Icon() const noexcept
-    {
-        // Fragment extensions may not have an Icon, so fall back to the extensions nav icon glyph
-        const auto icon = _package.Icon();
-        return icon.empty() ? NavTagIconMap[extensionsTag] : icon;
-    }
-
     hstring ExtensionPackageViewModel::Scope() const noexcept
     {
         return _package.Scope() == Model::FragmentScope::User ? RS_(L"Extensions_ScopeUser") : RS_(L"Extensions_ScopeSystem");

src/cascadia/TerminalSettingsEditor/Extensions.h

@@ -48,14 +48,13 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         bool NoSchemesAdded() const noexcept { return _colorSchemesAddedView.Size() == 0; }
 
         // Views
-        // NOTE: the extensions are being loaded asynchronously in the ctor. _extensionPackages may be null in that brief window of time.
-        Windows::Foundation::Collections::IObservableVector<Editor::ExtensionPackageViewModel> ExtensionPackages() const noexcept { return _extensionPackages ? _extensionPackages : single_threaded_observable_vector<Editor::ExtensionPackageViewModel>(); }
+        Windows::Foundation::Collections::IObservableVector<Editor::ExtensionPackageViewModel> ExtensionPackages() const noexcept { return _extensionPackages; }
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> ProfilesModified() const noexcept { return _profilesModifiedView; }
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> ProfilesAdded() const noexcept { return _profilesAddedView; }
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentColorSchemeViewModel> ColorSchemesAdded() const noexcept { return _colorSchemesAddedView; }
 
         // Methods
-        void LoadExtensions();
+        void LazyLoadExtensions();
         void UpdateSettings(const Model::CascadiaSettings& settings, const Editor::ColorSchemesPageViewModel& colorSchemesPageVM);
         void NavigateToProfile(const guid profileGuid);
         void NavigateToColorScheme(const Editor::ColorSchemeViewModel& schemeVM);
@@ -76,9 +75,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> _profilesModifiedView;
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentProfileViewModel> _profilesAddedView;
         Windows::Foundation::Collections::IObservableVector<Editor::FragmentColorSchemeViewModel> _colorSchemesAddedView;
-        std::once_flag _extensionsLoaded;
+        bool _extensionsLoaded;
 
-        safe_void_coroutine _LoadExtensionsAsync();
         void _UpdateListViews(bool updateProfilesModified, bool updateProfilesAdded, bool updateColorSchemesAdded);
     };
 
@@ -95,8 +93,6 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
         void UpdateSettings(const Model::CascadiaSettings& settings);
 
         Model::ExtensionPackage Package() const noexcept { return _package; }
-        hstring DisplayName() const noexcept;
-        hstring Icon() const noexcept;
         hstring Scope() const noexcept;
         bool Enabled() const;
         void Enabled(bool val);

src/cascadia/TerminalSettingsEditor/Extensions.idl

@@ -40,8 +40,6 @@ namespace Microsoft.Terminal.Settings.Editor
     [default_interface] runtimeclass ExtensionPackageViewModel : Windows.UI.Xaml.Data.INotifyPropertyChanged
     {
         Microsoft.Terminal.Settings.Model.ExtensionPackage Package { get; };
-        String DisplayName { get; };
-        String Icon { get; };
         Boolean Enabled;
         String Scope { get; };
         String AccessibleName { get; };

src/cascadia/TerminalSettingsEditor/Extensions.xaml

@@ -500,8 +500,7 @@
                 <muxc:Expander.Content>
                     <StackPanel>
                         <!--  Scope  -->
-                        <local:SettingContainer x:Name="Scope"
-                                                x:Uid="Extensions_Scope"
+                        <local:SettingContainer x:Uid="Extensions_Scope"
                                                 Content="{x:Bind ViewModel.CurrentExtensionPackage.Scope, Mode=OneWay}"
                                                 IsTabStop="False"
                                                 Style="{StaticResource SettingContainerWithTextContent}" />

src/cascadia/TerminalSettingsEditor/GlobalAppearance.cpp

@@ -23,9 +23,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
 
     void GlobalAppearance::OnNavigatedTo(const NavigationEventArgs& e)
     {
-        const auto args = e.Parameter().as<Editor::NavigateToPageArgs>();
-        _ViewModel = args.ViewModel().as<Editor::GlobalAppearanceViewModel>();
-        BringIntoViewWhenLoaded(args.ElementToFocus());
+        _ViewModel = e.Parameter().as<Editor::GlobalAppearanceViewModel>();
 
         TraceLoggingWrite(
             g_hTerminalSettingsEditorProvider,

src/cascadia/TerminalSettingsEditor/GlobalAppearance.idl

@@ -5,7 +5,7 @@ import "GlobalAppearanceViewModel.idl";
 
 namespace Microsoft.Terminal.Settings.Editor
 {
-    runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
+    [default_interface] runtimeclass GlobalAppearance : Windows.UI.Xaml.Controls.Page
     {
         GlobalAppearance();
         GlobalAppearanceViewModel ViewModel { get; };

src/cascadia/TerminalSettingsEditor/GlobalAppearance.xaml

@@ -28,8 +28,7 @@
 
     <StackPanel Style="{StaticResource SettingsStackStyle}">
         <!--  Theme  -->
-        <local:SettingContainer x:Name="Theme"
-                                x:Uid="Globals_Theme">
+        <local:SettingContainer x:Uid="Globals_Theme">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemsSource="{x:Bind ViewModel.ThemeList, Mode=OneWay}"
                       SelectedItem="{x:Bind ViewModel.CurrentTheme, Mode=TwoWay}"
@@ -43,8 +42,7 @@
         </local:SettingContainer>
 
         <!--  Position of new tab  -->
-        <local:SettingContainer x:Name="NewTabPosition"
-                                x:Uid="Globals_NewTabPosition">
+        <local:SettingContainer x:Uid="Globals_NewTabPosition">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.NewTabPositionList, Mode=OneWay}"
@@ -53,52 +51,45 @@
         </local:SettingContainer>
 
         <!--  Show Titlebar  -->
-        <local:SettingContainer x:Name="ShowTitlebar"
-                                x:Uid="Globals_ShowTitlebar">
+        <local:SettingContainer x:Uid="Globals_ShowTitlebar">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsInTitlebar, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}"
                           Toggled="{x:Bind ViewModel.ShowTitlebarToggled}" />
         </local:SettingContainer>
 
         <!--  Always show tabs  -->
-        <local:SettingContainer x:Name="AlwaysShowTabs"
-                                x:Uid="Globals_AlwaysShowTabs">
+        <local:SettingContainer x:Uid="Globals_AlwaysShowTabs">
             <ToggleSwitch IsEnabled="{x:Bind mtu:Converters.InvertBoolean(ViewModel.ShowTabsInTitlebar), Mode=OneWay}"
                           IsOn="{x:Bind ViewModel.AlwaysShowTabs, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show tabs in full screen  -->
-        <local:SettingContainer x:Name="ShowTabsFullscreen"
-                                x:Uid="Globals_ShowTabsFullscreen">
+        <local:SettingContainer x:Uid="Globals_ShowTabsFullscreen">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTabsFullscreen, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Acrylic in Tab Row  -->
-        <local:SettingContainer x:Name="AcrylicTabRow"
-                                x:Uid="Globals_AcrylicTabRow">
+        <local:SettingContainer x:Uid="Globals_AcrylicTabRow">
             <ToggleSwitch IsOn="{x:Bind ViewModel.UseAcrylicInTabRow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Title in Titlebar  -->
-        <local:SettingContainer x:Name="ShowTitleInTitlebar"
-                                x:Uid="Globals_ShowTitleInTitlebar">
+        <local:SettingContainer x:Uid="Globals_ShowTitleInTitlebar">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowTitleInTitlebar, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Always on Top  -->
-        <local:SettingContainer x:Name="AlwaysOnTop"
-                                x:Uid="Globals_AlwaysOnTop">
+        <local:SettingContainer x:Uid="Globals_AlwaysOnTop">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOnTop, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Tab Width Mode  -->
-        <local:SettingContainer x:Name="TabWidthMode"
-                                x:Uid="Globals_TabWidthMode">
+        <local:SettingContainer x:Uid="Globals_TabWidthMode">
             <ComboBox AutomationProperties.AccessibilityView="Content"
                       ItemTemplate="{StaticResource EnumComboBoxTemplate}"
                       ItemsSource="{x:Bind ViewModel.TabWidthModeList, Mode=OneWay}"
@@ -108,43 +99,37 @@
 
         <!--  Disable Animations  -->
         <!--  NOTE: the UID is "DisablePaneAnimationsReversed" not "DisablePaneAnimations". See GH#9124 for more details.  -->
-        <local:SettingContainer x:Name="DisableAnimations"
-                                x:Uid="Globals_DisableAnimationsReversed">
+        <local:SettingContainer x:Uid="Globals_DisableAnimationsReversed">
             <ToggleSwitch IsOn="{x:Bind ViewModel.InvertedDisableAnimations, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Always Show Notification Icon  -->
-        <local:SettingContainer x:Name="AlwaysShowNotificationIcon"
-                                x:Uid="Globals_AlwaysShowNotificationIcon">
+        <local:SettingContainer x:Uid="Globals_AlwaysShowNotificationIcon">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysShowNotificationIcon, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Minimize To Notification Area  -->
-        <local:SettingContainer x:Name="MinimizeToNotificationArea"
-                                x:Uid="Globals_MinimizeToNotificationArea">
+        <local:SettingContainer x:Uid="Globals_MinimizeToNotificationArea">
             <ToggleSwitch IsOn="{x:Bind ViewModel.MinimizeToNotificationArea, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Automatically hide window  -->
-        <local:SettingContainer x:Name="AutoHideWindow"
-                                x:Uid="Globals_AutoHideWindow">
+        <local:SettingContainer x:Uid="Globals_AutoHideWindow">
             <ToggleSwitch IsOn="{x:Bind ViewModel.AutoHideWindow, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Show Admin Shield  -->
-        <local:SettingContainer x:Name="ShowAdminShield"
-                                x:Uid="Globals_ShowAdminShield">
+        <local:SettingContainer x:Uid="Globals_ShowAdminShield">
             <ToggleSwitch IsOn="{x:Bind ViewModel.ShowAdminShield, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>
 
         <!--  Enable Unfocused Acrylic  -->
-        <local:SettingContainer x:Name="EnableUnfocusedAcrylic"
-                                x:Uid="Globals_EnableUnfocusedAcrylic">
+        <local:SettingContainer x:Uid="Globals_EnableUnfocusedAcrylic">
             <ToggleSwitch IsOn="{x:Bind ViewModel.EnableUnfocusedAcrylic, Mode=TwoWay}"
                           Style="{StaticResource ToggleSwitchInExpanderStyle}" />
         </local:SettingContainer>

src/cascadia/TerminalSettingsEditor/IconPicker.cpp

@@ -33,6 +33,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
     Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconPicker::_BuiltInIcons{ nullptr };
     Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconPicker::_IconTypes{ nullptr };
     DependencyProperty IconPicker::_CurrentIconPathProperty{ nullptr };
+    DependencyProperty IconPicker::_WindowRootProperty{ nullptr };
 
     Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconPicker::BuiltInIcons() noexcept
     {
@@ -106,6 +107,15 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
                     xaml_typename<Editor::IconPicker>(),
                     PropertyMetadata{ nullptr, PropertyChangedCallback{ &IconPicker::_OnCurrentIconPathChanged } });
         }
+        if (!_WindowRootProperty)
+        {
+            _WindowRootProperty =
+                DependencyProperty::Register(
+                    L"WindowRoot",
+                    xaml_typename<IHostedInWindow>(),
+                    xaml_typename<Editor::IconPicker>(),
+                    PropertyMetadata{ nullptr });
+        }
     }
 
     void IconPicker::_OnCurrentIconPathChanged(const DependencyObject& d, const DependencyPropertyChangedEventArgs& /*e*/)