2021-10-08 00:43:17 +02:00
|
|
|
/*++
|
2021-07-09 22:43:58 +02:00
|
|
|
Copyright (c) Microsoft Corporation
|
|
|
|
Licensed under the MIT license.
|
|
|
|
|
|
|
|
Module Name:
|
|
|
|
- Appearances
|
|
|
|
|
|
|
|
Abstract:
|
|
|
|
- The classes defined in this module are responsible for encapsulating the appearance settings
|
|
|
|
of profiles and presenting them in the settings UI
|
|
|
|
|
|
|
|
Author(s):
|
|
|
|
- Pankaj Bhojwani - May 2021
|
|
|
|
|
|
|
|
--*/
|
|
|
|
|
|
|
|
#pragma once
|
|
|
|
|
|
|
|
#include "Font.g.h"
|
|
|
|
#include "Appearances.g.h"
|
|
|
|
#include "AppearanceViewModel.g.h"
|
|
|
|
#include "Utils.h"
|
|
|
|
#include "ViewModelHelpers.h"
|
|
|
|
#include "SettingContainer.h"
|
|
|
|
|
|
|
|
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
|
|
|
|
{
|
|
|
|
struct FontComparator
|
|
|
|
{
|
|
|
|
bool operator()(const Font& lhs, const Font& rhs) const
|
|
|
|
{
|
|
|
|
return lhs.LocalizedName() < rhs.LocalizedName();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
struct Font : FontT<Font>
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Font(std::wstring name, std::wstring localizedName) :
|
|
|
|
_Name{ name },
|
|
|
|
_LocalizedName{ localizedName } {};
|
|
|
|
|
|
|
|
hstring ToString() { return _LocalizedName; }
|
|
|
|
|
|
|
|
WINRT_PROPERTY(hstring, Name);
|
|
|
|
WINRT_PROPERTY(hstring, LocalizedName);
|
|
|
|
};
|
|
|
|
|
|
|
|
struct AppearanceViewModel : AppearanceViewModelT<AppearanceViewModel>, ViewModelHelper<AppearanceViewModel>
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
AppearanceViewModel(const Model::AppearanceConfig& appearance);
|
|
|
|
|
2021-08-04 00:25:23 +02:00
|
|
|
void SetFontWeightFromDouble(double fontWeight)
|
|
|
|
{
|
|
|
|
FontWeight(winrt::Microsoft::Terminal::Settings::Editor::Converters::DoubleToFontWeight(fontWeight));
|
|
|
|
}
|
|
|
|
void SetBackgroundImageOpacityFromPercentageValue(double percentageValue)
|
|
|
|
{
|
|
|
|
BackgroundImageOpacity(winrt::Microsoft::Terminal::Settings::Editor::Converters::PercentageValueToPercentage(percentageValue));
|
|
|
|
}
|
|
|
|
void SetBackgroundImagePath(winrt::hstring path)
|
|
|
|
{
|
|
|
|
BackgroundImagePath(path);
|
|
|
|
}
|
|
|
|
|
2021-07-09 22:43:58 +02:00
|
|
|
// background image
|
|
|
|
bool UseDesktopBGImage();
|
|
|
|
void UseDesktopBGImage(const bool useDesktop);
|
|
|
|
bool BackgroundImageSettingsVisible();
|
|
|
|
|
|
|
|
Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme> Schemes() { return _Schemes; }
|
|
|
|
void Schemes(const Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme>& val) { _Schemes = val; }
|
|
|
|
|
2021-07-14 01:33:22 +02:00
|
|
|
WINRT_PROPERTY(bool, IsDefault, false);
|
2021-07-09 22:43:58 +02:00
|
|
|
WINRT_PROPERTY(IHostedInWindow, WindowRoot, nullptr);
|
|
|
|
|
|
|
|
// These settings are not defined in AppearanceConfig, so we grab them
|
|
|
|
// from the source profile itself. The reason we still want them in the
|
|
|
|
// AppearanceViewModel is so we can continue to have the 'Text' grouping
|
|
|
|
// we currently have in xaml, since that grouping has some settings that
|
|
|
|
// are defined in AppearanceConfig and some that are not.
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance.SourceProfile().FontInfo(), FontFace);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance.SourceProfile().FontInfo(), FontSize);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance.SourceProfile().FontInfo(), FontWeight);
|
|
|
|
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, RetroTerminalEffect);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, CursorShape);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, CursorHeight);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, ColorSchemeName);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, BackgroundImagePath);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, BackgroundImageOpacity);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, BackgroundImageStretchMode);
|
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, BackgroundImageAlignment);
|
Add an ENUM setting for disabling rendering "intense" text as bold (#10759)
## Summary of the Pull Request
This adds a new setting `intenseTextStyle`. It's a per-appearance, control setting, defaulting to `"all"`.
* When set to `"all"` or `["bold", "bright"]`, then we'll render text as both **bold** and bright (1.10 behavior)
* When set to `"bold"`, `["bold"]`, we'll render text formatted with `^[[1m` as **bold**, but not bright
* When set to `"bright"`, `["bright"]`, we'll render text formatted with `^[[1m` as bright, but not bold. This is the pre 1.10 behavior
* When set to `"none"`, we won't do anything special for it at all.
## references
* I last did this in #10648. This time it's an enum, so we can add bright in the future. It's got positive wording this time.
* ~We will want to add `"bright"` as a value in the future, to disable the auto intense->bright conversion.~ I just did that now.
* #5682 is related
## PR Checklist
* [x] Closes #10576
* [x] I seriously don't think we have an issue for "disable intense is bright", but I'm not crazy, people wanted that, right? https://github.com/microsoft/terminal/issues/2916#issuecomment-544880423 was the closest
* [x] I work here
* [x] Tests added/passed
* [x] https://github.com/MicrosoftDocs/terminal/pull/381
## Validation Steps Performed
<!-- ![image](https://user-images.githubusercontent.com/18356694/125480327-07f6b711-6bca-4c1b-9a76-75fc978c702d.png) -->
![image](https://user-images.githubusercontent.com/18356694/128929228-504933ee-cf50-43a2-9982-55110ba39191.png)
Yea that works. Printed some bold text, toggled it on, the text was no longer bold. hooray.
### EDIT, 10 Aug
```json
"intenseTextStyle": "none",
"intenseTextStyle": "bold",
"intenseTextStyle": "bright",
"intenseTextStyle": "all",
"intenseTextStyle": ["bold", "bright"],
```
all work now. Repro script:
```sh
printf "\e[1m[bold]\e[m[normal]\e[34m[blue]\e[1m[bold blue]\e[m\n"
```
2021-08-16 15:45:56 +02:00
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, IntenseTextStyle);
|
2021-10-08 00:43:17 +02:00
|
|
|
OBSERVABLE_PROJECTED_SETTING(_appearance, AdjustIndistinguishableColors);
|
2021-07-09 22:43:58 +02:00
|
|
|
|
|
|
|
private:
|
|
|
|
Model::AppearanceConfig _appearance;
|
|
|
|
winrt::hstring _lastBgImagePath;
|
|
|
|
Windows::Foundation::Collections::IMapView<hstring, Model::ColorScheme> _Schemes;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct Appearances : AppearancesT<Appearances>
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
Appearances();
|
|
|
|
|
|
|
|
// font face
|
|
|
|
Windows::Foundation::IInspectable CurrentFontFace() const;
|
|
|
|
|
|
|
|
// CursorShape visibility logic
|
|
|
|
bool IsVintageCursor() const;
|
|
|
|
|
|
|
|
Model::ColorScheme CurrentColorScheme();
|
|
|
|
void CurrentColorScheme(const Model::ColorScheme& val);
|
|
|
|
|
|
|
|
bool UsingMonospaceFont() const noexcept;
|
|
|
|
bool ShowAllFonts() const noexcept;
|
|
|
|
void ShowAllFonts(const bool& value);
|
|
|
|
|
|
|
|
fire_and_forget BackgroundImage_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
|
|
void BIAlignment_Click(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::RoutedEventArgs const& e);
|
|
|
|
void FontFace_SelectionChanged(Windows::Foundation::IInspectable const& sender, Windows::UI::Xaml::Controls::SelectionChangedEventArgs const& e);
|
|
|
|
|
|
|
|
// manually bind FontWeight
|
|
|
|
Windows::Foundation::IInspectable CurrentFontWeight() const;
|
|
|
|
void CurrentFontWeight(const Windows::Foundation::IInspectable& enumEntry);
|
|
|
|
bool IsCustomFontWeight();
|
|
|
|
WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector<Microsoft::Terminal::Settings::Editor::EnumEntry>, FontWeightList);
|
|
|
|
|
|
|
|
GETSET_BINDABLE_ENUM_SETTING(CursorShape, Microsoft::Terminal::Core::CursorStyle, Appearance, CursorShape);
|
|
|
|
WINRT_PROPERTY(Windows::Foundation::Collections::IObservableVector<Model::ColorScheme>, ColorSchemeList, nullptr);
|
|
|
|
|
|
|
|
WINRT_CALLBACK(PropertyChanged, Windows::UI::Xaml::Data::PropertyChangedEventHandler);
|
|
|
|
DEPENDENCY_PROPERTY(Editor::AppearanceViewModel, Appearance);
|
|
|
|
WINRT_PROPERTY(Editor::ProfileViewModel, SourceProfile, nullptr);
|
|
|
|
|
|
|
|
GETSET_BINDABLE_ENUM_SETTING(BackgroundImageStretchMode, Windows::UI::Xaml::Media::Stretch, Appearance, BackgroundImageStretchMode);
|
|
|
|
|
Add an ENUM setting for disabling rendering "intense" text as bold (#10759)
## Summary of the Pull Request
This adds a new setting `intenseTextStyle`. It's a per-appearance, control setting, defaulting to `"all"`.
* When set to `"all"` or `["bold", "bright"]`, then we'll render text as both **bold** and bright (1.10 behavior)
* When set to `"bold"`, `["bold"]`, we'll render text formatted with `^[[1m` as **bold**, but not bright
* When set to `"bright"`, `["bright"]`, we'll render text formatted with `^[[1m` as bright, but not bold. This is the pre 1.10 behavior
* When set to `"none"`, we won't do anything special for it at all.
## references
* I last did this in #10648. This time it's an enum, so we can add bright in the future. It's got positive wording this time.
* ~We will want to add `"bright"` as a value in the future, to disable the auto intense->bright conversion.~ I just did that now.
* #5682 is related
## PR Checklist
* [x] Closes #10576
* [x] I seriously don't think we have an issue for "disable intense is bright", but I'm not crazy, people wanted that, right? https://github.com/microsoft/terminal/issues/2916#issuecomment-544880423 was the closest
* [x] I work here
* [x] Tests added/passed
* [x] https://github.com/MicrosoftDocs/terminal/pull/381
## Validation Steps Performed
<!-- ![image](https://user-images.githubusercontent.com/18356694/125480327-07f6b711-6bca-4c1b-9a76-75fc978c702d.png) -->
![image](https://user-images.githubusercontent.com/18356694/128929228-504933ee-cf50-43a2-9982-55110ba39191.png)
Yea that works. Printed some bold text, toggled it on, the text was no longer bold. hooray.
### EDIT, 10 Aug
```json
"intenseTextStyle": "none",
"intenseTextStyle": "bold",
"intenseTextStyle": "bright",
"intenseTextStyle": "all",
"intenseTextStyle": ["bold", "bright"],
```
all work now. Repro script:
```sh
printf "\e[1m[bold]\e[m[normal]\e[34m[blue]\e[1m[bold blue]\e[m\n"
```
2021-08-16 15:45:56 +02:00
|
|
|
GETSET_BINDABLE_ENUM_SETTING(IntenseTextStyle, Microsoft::Terminal::Settings::Model::IntenseStyle, Appearance, IntenseTextStyle);
|
|
|
|
|
2021-07-09 22:43:58 +02:00
|
|
|
private:
|
|
|
|
bool _ShowAllFonts;
|
|
|
|
void _UpdateBIAlignmentControl(const int32_t val);
|
|
|
|
std::array<Windows::UI::Xaml::Controls::Primitives::ToggleButton, 9> _BIAlignmentButtons;
|
|
|
|
|
|
|
|
Windows::Foundation::Collections::IMap<uint16_t, Microsoft::Terminal::Settings::Editor::EnumEntry> _FontWeightMap;
|
|
|
|
Editor::EnumEntry _CustomFontWeight{ nullptr };
|
|
|
|
|
|
|
|
Windows::UI::Xaml::Data::INotifyPropertyChanged::PropertyChanged_revoker _ViewModelChangedRevoker;
|
|
|
|
static void _ViewModelChanged(Windows::UI::Xaml::DependencyObject const& d, Windows::UI::Xaml::DependencyPropertyChangedEventArgs const& e);
|
|
|
|
void _UpdateWithNewViewModel();
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
namespace winrt::Microsoft::Terminal::Settings::Editor::factory_implementation
|
|
|
|
{
|
|
|
|
BASIC_FACTORY(Appearances);
|
|
|
|
}
|