d749df70ed
**BE NOT AFRAID**. I know that there's 107 files in this PR, but almost all of it is just find/replacing `TerminalControl` with `Control`. This is the start of the work to move TermControl into multiple pieces, for #5000. The PR starts this work by: * Splits `TerminalControl` into separate lib and dll projects. We'll want control tests in the future, and for that, we'll need a lib. * Moves `ICoreSettings` back into the `Microsoft.Terminal.Core` namespace. We'll have other types in there soon too. * I could not tell you why this works suddenly. New VS versions? New cppwinrt version? Maybe we're just better at dealing with mdmerge bugs these days. * RENAMES `Microsoft.Terminal.TerminalControl` to `Microsoft.Terminal.Control`. This touches pretty much every file in the sln. Sorry about that (not sorry). An upcoming PR will move much of the logic in TermControl into a new `ControlCore` class that we'll add in `Microsoft.Terminal.Core`. `ControlCore` will then be unittest-able in the `UnitTests_TerminalCore`, which will help prevent regressions like #9455 ## Detailed Description of the Pull Request / Additional comments You're really gonna want to clean the sln first, then merge this into your branch, then rebuild. It's very likely that old winmds will get left behind. If you see something like ``` Error MDM2007 Cannot create type Microsoft.Terminal.TerminalControl.KeyModifiers in read-only metadata file Microsoft.Terminal.TerminalControl. ``` then that's what happened to you.
93 lines
2.6 KiB
C++
93 lines
2.6 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "pch.h"
|
|
#include <LibraryResources.h>
|
|
#include "SettingsTab.h"
|
|
#include "SettingsTab.g.cpp"
|
|
#include "Utils.h"
|
|
|
|
using namespace winrt;
|
|
using namespace winrt::Windows::UI::Xaml;
|
|
using namespace winrt::Windows::UI::Core;
|
|
using namespace winrt::Microsoft::Terminal::Control;
|
|
using namespace winrt::Microsoft::Terminal::Settings::Model;
|
|
using namespace winrt::Microsoft::Terminal::Settings::Editor;
|
|
using namespace winrt::Windows::System;
|
|
|
|
namespace winrt
|
|
{
|
|
namespace MUX = Microsoft::UI::Xaml;
|
|
namespace WUX = Windows::UI::Xaml;
|
|
}
|
|
|
|
namespace winrt::TerminalApp::implementation
|
|
{
|
|
SettingsTab::SettingsTab(MainPage settingsUI)
|
|
{
|
|
Content(settingsUI);
|
|
|
|
_MakeTabViewItem();
|
|
_CreateContextMenu();
|
|
_CreateIcon();
|
|
}
|
|
|
|
void SettingsTab::UpdateSettings(CascadiaSettings settings)
|
|
{
|
|
auto settingsUI{ Content().as<MainPage>() };
|
|
settingsUI.UpdateSettings(settings);
|
|
}
|
|
|
|
// Method Description:
|
|
// - Focus the settings UI
|
|
// Arguments:
|
|
// - focusState: The FocusState mode by which focus is to be obtained.
|
|
// Return Value:
|
|
// - <none>
|
|
void SettingsTab::Focus(WUX::FocusState focusState)
|
|
{
|
|
_focusState = focusState;
|
|
|
|
if (_focusState != FocusState::Unfocused)
|
|
{
|
|
Content().as<WUX::Controls::Page>().Focus(focusState);
|
|
}
|
|
}
|
|
|
|
// Method Description:
|
|
// - Initializes a TabViewItem for this Tab instance.
|
|
// Arguments:
|
|
// - <none>
|
|
// Return Value:
|
|
// - <none>
|
|
void SettingsTab::_MakeTabViewItem()
|
|
{
|
|
TabViewItem(::winrt::MUX::Controls::TabViewItem{});
|
|
Title(RS_(L"SettingsTab"));
|
|
TabViewItem().Header(winrt::box_value(Title()));
|
|
}
|
|
|
|
// Method Description:
|
|
// - Set the icon on the TabViewItem for this tab.
|
|
// Arguments:
|
|
// - <none>
|
|
// Return Value:
|
|
// - <none>
|
|
winrt::fire_and_forget SettingsTab::_CreateIcon()
|
|
{
|
|
auto weakThis{ get_weak() };
|
|
|
|
co_await winrt::resume_foreground(TabViewItem().Dispatcher());
|
|
|
|
if (auto tab{ weakThis.get() })
|
|
{
|
|
auto fontFamily = winrt::WUX::Media::FontFamily(L"Segoe MDL2 Assets");
|
|
auto glyph = L"\xE713"; // This is the Setting icon (looks like a gear)
|
|
|
|
// The TabViewItem Icon needs MUX while the IconSourceElement in the CommandPalette needs WUX...
|
|
Icon(glyph);
|
|
TabViewItem().IconSource(IconPathConverter::IconSourceMUX(glyph));
|
|
}
|
|
}
|
|
}
|