starred/terminal-microsoft
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-07-08 17:46:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix the build ; add to the SUI & cmdpal

Browse Source
This commit is contained in:
Mike Griese
2026-06-04 16:34:05 -05:00
parent d9a8e59103
commit 244b2159c0
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cascadia/TerminalApp/OverviewPane.cpp
View File

@@ -467,7 +467,6 @@ namespace winrt::TerminalApp::implementation
// window is being torn down — the originalParent may already be in
// a disposed/disconnected state. Make it best-effort; the destructor
// calls us and we must not throw.
size_t reparentIdx = 0;
for (auto& entry : _reparentedContent)
{
if (!entry.content)
@@ -486,13 +485,11 @@ namespace winrt::TerminalApp::implementation
_DetachContent(entry.content);
const bool hadOrigParent = static_cast<bool>(entry.originalParent);
// Put it back where it came from
if (entry.originalParent)
{
entry.originalParent.Children().Append(entry.content);
}
const bool stillParented = static_cast<bool>(VisualTreeHelper::GetParent(entry.content));
}
CATCH_LOG()
}

3
src/cascadia/TerminalApp/TabManagement.cpp
View File

@@ -1120,9 +1120,6 @@ namespace winrt::TerminalApp::implementation
try
{
_tabContent.Children().Clear();
auto content = tab ? tab.Content() : nullptr;
const bool hasContent = static_cast<bool>(content);
const bool hasParent = hasContent && static_cast<bool>(WUX::Media::VisualTreeHelper::GetParent(content));
_tabContent.Children().Append(tab.Content());
// GH#7409: If the tab switcher is open, then we _don't_ want to

1
src/cascadia/TerminalSettingsModel/ActionMap.cpp
View File

@@ -159,6 +159,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
{ ShortcutAction::ToggleCommandPalette, USES_RESOURCE(L"ToggleCommandPaletteCommandKey") },
{ ShortcutAction::ToggleFocusMode, USES_RESOURCE(L"ToggleFocusModeCommandKey") },
{ ShortcutAction::ToggleFullscreen, USES_RESOURCE(L"ToggleFullscreenCommandKey") },
{ ShortcutAction::ToggleOverview, USES_RESOURCE(L"ToggleOverviewCommandKey") },
{ ShortcutAction::TogglePaneReadOnly, USES_RESOURCE(L"TogglePaneReadOnlyCommandKey") },
{ ShortcutAction::TogglePaneZoom, USES_RESOURCE(L"TogglePaneZoomCommandKey") },
{ ShortcutAction::ToggleShaderEffects, USES_RESOURCE(L"ToggleShaderEffectsCommandKey") },