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

address Pankaj's feedback

Browse Source
This commit is contained in:
Carlos Zamora
2026-01-28 11:33:48 -08:00
parent 469a6d73be
commit cee7393e1e
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cascadia/TerminalSettingsEditor/IconPicker.h
View File

@@ -15,6 +15,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
public:
IconPicker();
static constexpr std::wstring_view HideIconValue{ L"none" };
static Windows::UI::Xaml::Controls::IconSource BuiltInIconConverter(const Windows::Foundation::IInspectable& iconVal);
static Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> BuiltInIcons() noexcept;
static Windows::Foundation::Collections::IObservableVector<Editor::EnumEntry> IconTypes() noexcept;

7
src/cascadia/TerminalSettingsEditor/NewTabMenuViewModel.cpp
View File

@@ -3,6 +3,7 @@
#include "pch.h"
#include "NewTabMenuViewModel.h"
#include "IconPicker.h"
#include "NewTabMenuViewModel.g.cpp"
#include "FolderTreeViewEntry.g.cpp"
@@ -22,8 +23,6 @@ using namespace winrt::Windows::UI::Xaml::Data;
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{
static constexpr std::wstring_view HideIconValue{ L"none" };
static IObservableVector<Editor::NewTabMenuEntryViewModel> _ConvertToViewModelEntries(const IVector<Model::NewTabMenuEntry>& settingsModelEntries, const Model::CascadiaSettings& settings)
{
std::vector<Editor::NewTabMenuEntryViewModel> result{};
@@ -262,7 +261,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
if (_CurrentFolder && _CurrentFolder.Icon() != path)
{
_CurrentFolder.Icon(path);
_NotifyChanges(L"CurrentFolderIconPath", L"CurrentFolderIconPreview", L"UsingNoIcon");
_NotifyChanges(L"CurrentFolderIconPreview", L"CurrentFolderLocalizedIcon", L"CurrentFolderIconPath", L"CurrentFolderUsingNoIcon");
}
}
@@ -273,7 +272,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
return false;
}
const auto icon{ _CurrentFolder.Icon() };
return icon.empty() || icon == HideIconValue;
return icon.empty() || icon == IconPicker::HideIconValue;
}
Windows::Foundation::Collections::IObservableVector<Editor::NewTabMenuEntryViewModel> NewTabMenuViewModel::CurrentView() const

4
src/cascadia/TerminalSettingsEditor/ProfileViewModel.cpp
View File

@@ -6,6 +6,7 @@
#include "ProfileViewModel.g.cpp"
#include "Appearances.h"
#include "EnumEntry.h"
#include "IconPicker.h"
#include "../WinRTUtils/inc/Utils.h"
#include "../../renderer/base/FontCache.h"
@@ -22,7 +23,6 @@ using namespace winrt::Microsoft::Terminal::Settings::Model;
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{
static constexpr std::wstring_view HideIconValue{ L"none" };
static Editor::Font fontObjectForDWriteFont(IDWriteFontFamily* family, const wchar_t* locale);
Windows::Foundation::Collections::IObservableVector<Editor::Font> ProfileViewModel::_MonospaceFontList{ nullptr };
@@ -568,7 +568,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
bool ProfileViewModel::UsingNoIcon() const noexcept
{
const auto iconPath{ IconPath() };
return iconPath.empty() || iconPath == HideIconValue;
return iconPath.empty() || iconPath == IconPicker::HideIconValue;
}
hstring ProfileViewModel::BellStylePreview() const