df26c677ef
* We had to move to the final API: * Items -> TabItems * Items.VectorChanged -> TabItemsChanged * TabClose -> TabCloseRequested * TabViewItem.Icon -> TabViewItem.IconSource * TabRowControl has been converted to a ContentPresenter, which simplifies its logic a little bit. * TerminalPage now differentiates MUX and WUX a little better * Because of the change from Icon to IconSource in TabViewItem, Utils::GetColoredIcon needed to be augmented to support MUX IconSources. It was still necessary to use for WUX, so it's been templatized. * I moved us from WUX SplitButton to MUX SplitButton and brought the style in line with the one typically provided by TabView. * Some of our local controls have had their backgrounds removed so they're more amenable to being placed on other surfaces. * I'm suppressing the TabView's padding. * I removed a number of apparently dead methods from App. * I've simplified the dragbar's sizing logic and eventing. * The winmd harvester needed to be taught to not try to copy winmds for framework packages. * We now only initialize the terminal once we know the size Closes #1896. Closes #444. Closes #857. Closes #771. Closes #760.
120 lines
3.4 KiB
C++
120 lines
3.4 KiB
C++
/*++
|
|
Copyright (c) Microsoft Corporation
|
|
Licensed under the MIT license.
|
|
|
|
Module Name:
|
|
- Utils.h
|
|
|
|
Abstract:
|
|
- Helpers for the TerminalApp project
|
|
Author(s):
|
|
- Mike Griese - May 2019
|
|
|
|
--*/
|
|
#pragma once
|
|
|
|
std::wstring GetWstringFromJson(const Json::Value& json);
|
|
|
|
// Method Description:
|
|
// - Create a std::string from a string_view. We do this because we can't look
|
|
// up a key in a Json::Value with a string_view directly, so instead we'll use
|
|
// this helper. Should a string_view lookup ever be added to jsoncpp, we can
|
|
// remove this entirely.
|
|
// Arguments:
|
|
// - key: the string_view to build a string from
|
|
// Return Value:
|
|
// - a std::string to use for looking up a value from a Json::Value
|
|
inline std::string JsonKey(const std::string_view key)
|
|
{
|
|
return static_cast<std::string>(key);
|
|
}
|
|
|
|
// This is a pair of helpers for determining if a pair of guids are equal, and
|
|
// establishing an ordering on GUIDs (via std::less).
|
|
namespace std
|
|
{
|
|
template<>
|
|
struct less<GUID>
|
|
{
|
|
bool operator()(const GUID& lhs, const GUID& rhs) const
|
|
{
|
|
return memcmp(&lhs, &rhs, sizeof(rhs)) < 0;
|
|
}
|
|
};
|
|
|
|
template<>
|
|
struct equal_to<GUID>
|
|
{
|
|
bool operator()(const GUID& lhs, const GUID& rhs) const
|
|
{
|
|
return memcmp(&lhs, &rhs, sizeof(rhs)) == 0;
|
|
}
|
|
};
|
|
}
|
|
|
|
namespace winrt::Microsoft::UI::Xaml::Controls
|
|
{
|
|
struct IconSource;
|
|
struct BitmapIconSource;
|
|
}
|
|
|
|
namespace winrt::Windows::UI::Xaml::Controls
|
|
{
|
|
struct IconSource;
|
|
struct BitmapIconSource;
|
|
}
|
|
|
|
namespace Microsoft::TerminalApp::details
|
|
{
|
|
// This is a template that helps us figure out which BitmapIconSource to use for a given IconSource.
|
|
// We have to do this because some of our code still wants to use WUX IconSources.
|
|
template<typename TIconSource>
|
|
struct BitmapIconSource
|
|
{
|
|
};
|
|
|
|
template<>
|
|
struct BitmapIconSource<winrt::Microsoft::UI::Xaml::Controls::IconSource>
|
|
{
|
|
using type = winrt::Microsoft::UI::Xaml::Controls::BitmapIconSource;
|
|
};
|
|
|
|
template<>
|
|
struct BitmapIconSource<winrt::Windows::UI::Xaml::Controls::IconSource>
|
|
{
|
|
using type = winrt::Windows::UI::Xaml::Controls::BitmapIconSource;
|
|
};
|
|
}
|
|
|
|
// Method Description:
|
|
// - Creates an IconElement for the given path. The icon returned is a colored
|
|
// icon. If we couldn't create the icon for any reason, we return an empty
|
|
// IconElement.
|
|
// Template Types:
|
|
// - <TIconSource>: The type of IconSource (MUX, WUX) to generate.
|
|
// Arguments:
|
|
// - path: the full, expanded path to the icon.
|
|
// Return Value:
|
|
// - An IconElement with its IconSource set, if possible.
|
|
template<typename TIconSource>
|
|
TIconSource GetColoredIcon(const winrt::hstring& path)
|
|
{
|
|
if (!path.empty())
|
|
{
|
|
try
|
|
{
|
|
winrt::Windows::Foundation::Uri iconUri{ path };
|
|
::Microsoft::TerminalApp::details::BitmapIconSource<TIconSource>::type iconSource;
|
|
// Make sure to set this to false, so we keep the RGB data of the
|
|
// image. Otherwise, the icon will be white for all the
|
|
// non-transparent pixels in the image.
|
|
iconSource.ShowAsMonochrome(false);
|
|
iconSource.UriSource(iconUri);
|
|
return iconSource;
|
|
}
|
|
CATCH_LOG();
|
|
}
|
|
|
|
return nullptr;
|
|
}
|