182a3bb573
This PR enables `ApplicationHighContrastAdjustment::None`. Doing this disables a set of mitigations in XAML designed to band-aid apps that were never explicitly designed for High Contrast (HC) modes. Terminal now has full control of and responsibility for its appearance in HC mode. This allows Terminal to look a lot better. On paper, we should be able to set `HighContrastAdjustment="None"` on the `<Application>` element. But that doesn't have any effect. I don't know if this is a bug in `<Toolkit:XamlApplication>` or somewhere else. So instead I set the property in codebehind, which is not as ideal, but does at least work. I'd love to a way to move this into App.xaml. The Find box had a couple stray styles to override the ToggleButton's foreground color. With backplating removed, these styles became actively harmful (white foreground on highlight color background), so I just removed them. The built-in style for ToggleButton is perfect as-is. Closes #5360
68 lines
2.4 KiB
C++
68 lines
2.4 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "pch.h"
|
|
#include "App.h"
|
|
#include "App.g.cpp"
|
|
|
|
using namespace winrt;
|
|
using namespace winrt::Windows::ApplicationModel::Activation;
|
|
using namespace winrt::Windows::Foundation;
|
|
using namespace winrt::Windows::UI::Xaml;
|
|
using namespace winrt::Windows::UI::Xaml::Controls;
|
|
using namespace winrt::Windows::UI::Xaml::Navigation;
|
|
|
|
namespace winrt::TerminalApp::implementation
|
|
{
|
|
App::App()
|
|
{
|
|
// This is the same trick that Initialize() is about to use to figure out whether we're coming
|
|
// from a UWP context or from a Win32 context
|
|
// See https://github.com/windows-toolkit/Microsoft.Toolkit.Win32/blob/52611c57d89554f357f281d0c79036426a7d9257/Microsoft.Toolkit.Win32.UI.XamlApplication/XamlApplication.cpp#L42
|
|
const auto dispatcherQueue = ::winrt::Windows::System::DispatcherQueue::GetForCurrentThread();
|
|
if (dispatcherQueue)
|
|
{
|
|
_isUwp = true;
|
|
}
|
|
|
|
Initialize();
|
|
|
|
// Disable XAML's automatic backplating of text when in High Contrast
|
|
// mode: we want full control of and responsibility for the foreground
|
|
// and background colors that we draw in XAML.
|
|
HighContrastAdjustment(::winrt::Windows::UI::Xaml::ApplicationHighContrastAdjustment::None);
|
|
}
|
|
|
|
AppLogic App::Logic()
|
|
{
|
|
static AppLogic logic;
|
|
return logic;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Invoked when the application is launched normally by the end user. Other entry points
|
|
/// will be used such as when the application is launched to open a specific file.
|
|
/// </summary>
|
|
/// <param name="e">Details about the launch request and process.</param>
|
|
void App::OnLaunched(LaunchActivatedEventArgs const& /*e*/)
|
|
{
|
|
// if this is a UWP... it means its our problem to hook up the content to the window here.
|
|
if (_isUwp)
|
|
{
|
|
auto content = Window::Current().Content();
|
|
if (content == nullptr)
|
|
{
|
|
auto logic = Logic();
|
|
logic.RunAsUwp(); // Must set UWP status first, settings might change based on it.
|
|
logic.LoadSettings();
|
|
logic.Create();
|
|
|
|
auto page = logic.GetRoot().as<TerminalPage>();
|
|
|
|
Window::Current().Content(page);
|
|
Window::Current().Activate();
|
|
}
|
|
}
|
|
}
|
|
}
|