77
88namespace winrt ::Microsoft::Terminal::UI::implementation
99{
10- winrt::hstring Converters::AppendPercentageSign (double value)
10+ // Booleans
11+ bool Converters::InvertBoolean (bool value)
1112 {
12- return to_hstring (gsl::narrow_cast< uint32_t >( std::lrint ( value))) + L" % "
13+ return ! value;
1314 }
1415
15- winrt::Windows::UI::Xaml::Media::SolidColorBrush Converters::ColorToBrush ( const winrt::Windows::UI::Color& color )
16+ winrt::Windows::UI::Xaml::Visibility Converters::InvertedBooleanToVisibility ( bool value )
1617 {
17- return Windows::UI::Xaml::Media::SolidColorBrush (color) ;
18+ return value ? winrt:: Windows::UI::Xaml::Visibility::Collapsed : winrt::Windows::UI::Xaml::Visibility::Visible ;
1819 }
1920
20- winrt::Windows::UI::Text::FontWeight Converters::DoubleToFontWeight (double value)
21+ // Numbers
22+ double Converters::PercentageToPercentageValue (double value)
2123 {
22- return winrt::Windows::UI::Text::FontWeight{ base::ClampedNumeric< uint16_t >( value) } ;
24+ return value * 100.0 ;
2325 }
2426
25- double Converters::FontWeightToDouble ( const winrt::Windows::UI::Text::FontWeight& fontWeight )
27+ double Converters::PercentageValueToPercentage ( double value )
2628 {
27- return fontWeight. Weight ;
29+ return value / 100.0 ;
2830 }
2931
30- bool Converters::InvertBoolean ( bool value)
32+ winrt::hstring Converters::PercentageToPercentageString ( double value)
3133 {
32- return ! value;
34+ return winrt::hstring{ fmt::format ( FMT_COMPILE ( L" {:.0f}% " ), value * 100.0 ) } ;
3335 }
3436
35- winrt::Windows::UI::Xaml::Visibility Converters::InvertedBooleanToVisibility (bool value)
37+ // Strings
38+ bool Converters::StringsAreNotEqual (const winrt::hstring& expected, const winrt::hstring& actual)
3639 {
37- return value ? winrt::Windows::UI::Xaml::Visibility::Collapsed : winrt::Windows::UI::Xaml::Visibility::Visible;
40+ return expected != actual;
41+ }
42+
43+ winrt::Windows::UI::Xaml::Visibility Converters::StringNotEmptyToVisibility (const winrt::hstring& value)
44+ {
45+ return value.empty () ? winrt::Windows::UI::Xaml::Visibility::Collapsed : winrt::Windows::UI::Xaml::Visibility::Visible;
46+ }
47+
48+ winrt::hstring Converters::StringOrEmptyIfPlaceholder (const winrt::hstring& placeholder, const winrt::hstring& value)
49+ {
50+ return placeholder == value ? L" "
51+ }
52+
53+ // Misc
54+ winrt::Windows::UI::Text::FontWeight Converters::DoubleToFontWeight (double value)
55+ {
56+ return winrt::Windows::UI::Text::FontWeight{ base::ClampedNumeric<uint16_t >(value) };
57+ }
58+
59+ winrt::Windows::UI::Xaml::Media::SolidColorBrush Converters::ColorToBrush (const winrt::Windows::UI::Color color)
60+ {
61+ return Windows::UI::Xaml::Media::SolidColorBrush (color);
62+ }
63+
64+ double Converters::FontWeightToDouble (const winrt::Windows::UI::Text::FontWeight fontWeight)
65+ {
66+ return fontWeight.Weight ;
3867 }
3968
4069 double Converters::MaxValueFromPaddingString (const winrt::hstring& paddingString)
4170 {
42- const auto singleCharDelim = L' ,'
43- std::wstringstream tokenStream (paddingString.c_str ());
44- std::wstring token;
71+ std::wstring_view remaining{ paddingString };
4572 double maxVal = 0 ;
46- size_t * idx = nullptr ;
4773
4874 // Get padding values till we run out of delimiter separated values in the stream
4975 // Non-numeral values detected will default to 0
50- // std::getline will not throw exception unless flags are set on the wstringstream
5176 // std::stod will throw invalid_argument exception if the input is an invalid double value
5277 // std::stod will throw out_of_range exception if the input value is more than DBL_MAX
5378 try
5479 {
55- while (std::getline (tokenStream, token, singleCharDelim ))
80+ while (!remaining. empty ( ))
5681 {
82+ const std::wstring token{ til::prefix_split (remaining, L' ,'
5783 // std::stod internally calls wcstod which handles whitespace prefix (which is ignored)
5884 // & stops the scan when first char outside the range of radix is encountered
5985 // We'll be permissive till the extent that stod function allows us to be by default
6086 // Ex. a value like 100.3#535w2 will be read as 100.3, but ;df25 will fail
61- const auto curVal = std::stod (token, idx );
87+ const auto curVal = std::stod (token);
6288 if (curVal > maxVal)
6389 {
6490 maxVal = curVal;
@@ -74,35 +100,4 @@ namespace winrt::Microsoft::Terminal::UI::implementation
74100
75101 return maxVal;
76102 }
77-
78- int Converters::PercentageToPercentageValue (double value)
79- {
80- return base::ClampMul (value, 100u );
81- }
82-
83- double Converters::PercentageValueToPercentage (double value)
84- {
85- return base::ClampDiv<double , double >(value, 100 );
86- }
87-
88- bool Converters::StringsAreNotEqual (const winrt::hstring& expected, const winrt::hstring& actual)
89- {
90- return expected != actual;
91- }
92- winrt::Windows::UI::Xaml::Visibility Converters::StringNotEmptyToVisibility (const winrt::hstring& value)
93- {
94- return value.empty () ? winrt::Windows::UI::Xaml::Visibility::Collapsed : winrt::Windows::UI::Xaml::Visibility::Visible;
95- }
96-
97- // Method Description:
98- // - Returns the value string, unless it matches the placeholder in which case the empty string.
99- // Arguments:
100- // - placeholder - the placeholder string.
101- // - value - the value string.
102- // Return Value:
103- // - The value string, unless it matches the placeholder in which case the empty string.
104- winrt::hstring Converters::StringOrEmptyIfPlaceholder (const winrt::hstring& placeholder, const winrt::hstring& value)
105- {
106- return placeholder == value ? L" "
107- }
108103}
0 commit comments