mirror of
https://github.com/microsoft/terminal.git
synced 2025-12-10 00:48:23 -06:00
Remove ProfileName from the surface of CoreSettings (#19261)
You know how much I hate squirreling away information on objects we have to pass halfway across the universe just to get back. In this case, `StartingTitle` will always be the name of the profile. We only used ProfileName in places where we _needed a Title_, so this makes it much more obvious what we're doing.
This commit is contained in:
parent
642a2aa41e
commit
68b723c16c
@ -1161,11 +1161,13 @@ void Pane::SetActive()
|
|||||||
// focused, else the profile of the last control to be focused
|
// focused, else the profile of the last control to be focused
|
||||||
Profile Pane::GetFocusedProfile()
|
Profile Pane::GetFocusedProfile()
|
||||||
{
|
{
|
||||||
auto lastFocused = GetActivePane();
|
if (auto lastFocused{ GetActivePane() })
|
||||||
|
{
|
||||||
if (const auto& terminalPane{ lastFocused->_getTerminalContent() })
|
if (const auto& terminalPane{ lastFocused->_getTerminalContent() })
|
||||||
{
|
{
|
||||||
return terminalPane.GetProfile();
|
return terminalPane.GetProfile();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2127,9 +2127,9 @@ namespace winrt::TerminalApp::implementation
|
|||||||
// - The value to populate in the title run of the tool tip
|
// - The value to populate in the title run of the tool tip
|
||||||
winrt::hstring Tab::_CreateToolTipTitle()
|
winrt::hstring Tab::_CreateToolTipTitle()
|
||||||
{
|
{
|
||||||
if (const auto& control{ GetActiveTerminalControl() })
|
if (const auto profile{ GetFocusedProfile() })
|
||||||
{
|
{
|
||||||
const auto profileName{ control.Settings().ProfileName() };
|
const auto profileName{ profile.Name() };
|
||||||
if (profileName != Title())
|
if (profileName != Title())
|
||||||
{
|
{
|
||||||
return winrt::hstring{ fmt::format(FMT_COMPILE(L"{}: {}"), profileName, Title()) };
|
return winrt::hstring{ fmt::format(FMT_COMPILE(L"{}: {}"), profileName, Title()) };
|
||||||
|
|||||||
@ -38,8 +38,6 @@ namespace Microsoft.Terminal.Control
|
|||||||
interface IControlSettings requires Microsoft.Terminal.Core.ICoreSettings,
|
interface IControlSettings requires Microsoft.Terminal.Core.ICoreSettings,
|
||||||
Microsoft.Terminal.Control.IControlAppearance
|
Microsoft.Terminal.Control.IControlAppearance
|
||||||
{
|
{
|
||||||
String ProfileName;
|
|
||||||
|
|
||||||
Boolean EnableUnfocusedAcrylic { get; };
|
Boolean EnableUnfocusedAcrylic { get; };
|
||||||
Guid SessionId { get; };
|
Guid SessionId { get; };
|
||||||
ScrollbarState ScrollState { get; };
|
ScrollbarState ScrollState { get; };
|
||||||
|
|||||||
@ -2610,9 +2610,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||||||
return _core.Title();
|
return _core.Title();
|
||||||
}
|
}
|
||||||
|
|
||||||
hstring TermControl::GetProfileName() const
|
hstring TermControl::GetStartingTitle() const
|
||||||
{
|
{
|
||||||
return _core.Settings().ProfileName();
|
return _core.Settings().StartingTitle();
|
||||||
}
|
}
|
||||||
|
|
||||||
hstring TermControl::WorkingDirectory() const
|
hstring TermControl::WorkingDirectory() const
|
||||||
|
|||||||
@ -58,7 +58,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||||||
|
|
||||||
uint64_t ContentId() const;
|
uint64_t ContentId() const;
|
||||||
|
|
||||||
hstring GetProfileName() const;
|
hstring GetStartingTitle() const;
|
||||||
|
|
||||||
bool CopySelectionToClipboard(bool dismissSelection, bool singleLine, bool withControlSequences, const CopyFormat formats);
|
bool CopySelectionToClipboard(bool dismissSelection, bool singleLine, bool withControlSequences, const CopyFormat formats);
|
||||||
void PasteTextFromClipboard();
|
void PasteTextFromClipboard();
|
||||||
|
|||||||
@ -308,14 +308,14 @@ namespace winrt::Microsoft::Terminal::Control::implementation
|
|||||||
// fall back to title if profile name is empty
|
// fall back to title if profile name is empty
|
||||||
if (auto control{ _termControl.get() })
|
if (auto control{ _termControl.get() })
|
||||||
{
|
{
|
||||||
const auto profileName = control->GetProfileName();
|
const auto originalName = control->GetStartingTitle();
|
||||||
if (profileName.empty())
|
if (originalName.empty())
|
||||||
{
|
{
|
||||||
return control->Title();
|
return control->Title();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return profileName;
|
return originalName;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -297,9 +297,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
|
|||||||
_AltGrAliasing = profile.AltGrAliasing();
|
_AltGrAliasing = profile.AltGrAliasing();
|
||||||
_AnswerbackMessage = profile.AnswerbackMessage();
|
_AnswerbackMessage = profile.AnswerbackMessage();
|
||||||
|
|
||||||
// Fill in the remaining properties from the profile
|
|
||||||
_ProfileName = profile.Name();
|
|
||||||
|
|
||||||
const auto fontInfo = profile.FontInfo();
|
const auto fontInfo = profile.FontInfo();
|
||||||
_FontFace = fontInfo.FontFace();
|
_FontFace = fontInfo.FontFace();
|
||||||
_FontSize = fontInfo.FontSize();
|
_FontSize = fontInfo.FontSize();
|
||||||
|
|||||||
@ -121,8 +121,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
|
|||||||
|
|
||||||
// ------------------------ End of Core Settings -----------------------
|
// ------------------------ End of Core Settings -----------------------
|
||||||
|
|
||||||
INHERITABLE_SETTING(Model::TerminalSettings, hstring, ProfileName);
|
|
||||||
|
|
||||||
INHERITABLE_SETTING(Model::TerminalSettings, guid, SessionId);
|
INHERITABLE_SETTING(Model::TerminalSettings, guid, SessionId);
|
||||||
INHERITABLE_SETTING(Model::TerminalSettings, bool, EnableUnfocusedAcrylic, false);
|
INHERITABLE_SETTING(Model::TerminalSettings, bool, EnableUnfocusedAcrylic, false);
|
||||||
INHERITABLE_SETTING(Model::TerminalSettings, bool, UseAcrylic, false);
|
INHERITABLE_SETTING(Model::TerminalSettings, bool, UseAcrylic, false);
|
||||||
|
|||||||
@ -60,7 +60,6 @@
|
|||||||
// --------------------------- Control Settings ---------------------------
|
// --------------------------- Control Settings ---------------------------
|
||||||
// All of these settings are defined in IControlSettings.
|
// All of these settings are defined in IControlSettings.
|
||||||
#define CONTROL_SETTINGS(X) \
|
#define CONTROL_SETTINGS(X) \
|
||||||
X(winrt::hstring, ProfileName) \
|
|
||||||
X(winrt::guid, SessionId) \
|
X(winrt::guid, SessionId) \
|
||||||
X(bool, EnableUnfocusedAcrylic, false) \
|
X(bool, EnableUnfocusedAcrylic, false) \
|
||||||
X(winrt::hstring, Padding, DEFAULT_PADDING) \
|
X(winrt::hstring, Padding, DEFAULT_PADDING) \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user