starred/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2026-05-19 21:41:15 +00:00
Code Issues 19.0k Packages Projects Releases 20 Wiki Activity

don't use GetProfileForArgs!

Browse Source
This commit is contained in:
Carlos Zamora
2022-08-25 16:48:04 -07:00
parent fd19751aef
commit 6112345f62
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/cascadia/TerminalApp/AppActionHandlers.cpp
View File

@@ -203,10 +203,11 @@ namespace winrt::TerminalApp::implementation
}
}
const auto newPane{ _MakePane(newTerminalArgs, realArgs.SplitMode() == SplitType::Duplicate) };
_SplitPane(realArgs.SplitDirection(),
// This is safe, we're already filtering so the value is (0, 1)
::base::saturated_cast<float>(realArgs.SplitSize()),
_MakePane(newTerminalArgs, realArgs.SplitMode() == SplitType::Duplicate));
newPane);
if (!_processingCommandlineArgs)
{
@@ -215,7 +216,7 @@ namespace winrt::TerminalApp::implementation
autoPeer.RaiseNotificationEvent(
Automation::Peers::AutomationNotificationKind::ActionCompleted,
Automation::Peers::AutomationNotificationProcessing::ImportantMostRecent,
fmt::format(std::wstring_view{ RS_(L"SplitPaneAnnouncement") }, _settings.GetProfileForArgs(newTerminalArgs).Name()),
fmt::format(std::wstring_view{ RS_(L"SplitPaneAnnouncement") }, newPane->GetProfile().Name()),
L"NewSplitPane" /* unique name for this notification category */);
}
}
@@ -392,21 +393,7 @@ namespace winrt::TerminalApp::implementation
}
}
const auto& newTerminalArgs = realArgs.TerminalArgs();
LOG_IF_FAILED(_OpenNewTab(newTerminalArgs));
if (!_processingCommandlineArgs)
{
if (auto autoPeer = Automation::Peers::FrameworkElementAutomationPeer::FromElement(*this))
{
// we can't check if this is a leaf pane,
// but getting the profile returns null if we aren't, so that works!
autoPeer.RaiseNotificationEvent(
Automation::Peers::AutomationNotificationKind::ActionCompleted,
Automation::Peers::AutomationNotificationProcessing::ImportantMostRecent,
fmt::format(std::wstring_view{ RS_(L"NewTabAnnouncement") }, _settings.GetProfileForArgs(newTerminalArgs).Name()),
L"NewTab" /* unique name for this notification category */);
}
}
LOG_IF_FAILED(_OpenNewTab(realArgs.TerminalArgs()));
args.Handled(true);
}
}

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

@@ -85,7 +85,21 @@ namespace winrt::TerminalApp::implementation
//
// This call to _MakePane won't return nullptr, we already checked that
// case above with the _maybeElevate call.
_CreateNewTabFromPane(_MakePane(newTerminalArgs, false, existingConnection));
const auto newPane{ _MakePane(newTerminalArgs, false, existingConnection) };
_CreateNewTabFromPane(newPane);
if (!_processingCommandlineArgs)
{
if (auto autoPeer = Automation::Peers::FrameworkElementAutomationPeer::FromElement(*this))
{
// we can't check if this is a leaf pane,
// but getting the profile returns null if we aren't, so that works!
autoPeer.RaiseNotificationEvent(
Automation::Peers::AutomationNotificationKind::ActionCompleted,
Automation::Peers::AutomationNotificationProcessing::ImportantMostRecent,
fmt::format(std::wstring_view{ RS_(L"NewTabAnnouncement") }, newPane->GetProfile().Name()),
L"NewTab" /* unique name for this notification category */);
}
}
const auto tabCount = _tabs.Size();
const auto usedManualProfile = (newTerminalArgs != nullptr) &&