1aff3bc216
* Created a ViewModel class in the Command Palette called FilteredCommand, aggregating the Command, the filter and the highlighted presentation of the command name * This ListView of the filtered commands is bound to the vector of FilteredCommands * Introduced HighlightedTextControl user control with HighlightedText view model * Added this control to the ListView Item's grid * Bound the FilteredCommand's highlighted command name to the user control ## Validation Steps Performed * UT for matching algorithm * Only manual tests * Searching in CommandLine, SwitchTab and Nested Command modes * Checking for bot matching an non matching filters * Dogfooding Closes #6646
94 lines
3.7 KiB
C++
94 lines
3.7 KiB
C++
// Copyright (c) Microsoft Corporation.
|
|
// Licensed under the MIT license.
|
|
|
|
#include "pch.h"
|
|
#include "winrt/Windows.UI.Xaml.Interop.h"
|
|
#include "HighlightedTextControl.h"
|
|
|
|
#include "HighlightedTextControl.g.cpp"
|
|
|
|
using namespace winrt;
|
|
using namespace winrt::TerminalApp;
|
|
using namespace winrt::Windows::UI::Core;
|
|
using namespace winrt::Windows::UI::Xaml;
|
|
using namespace winrt::Windows::System;
|
|
using namespace winrt::Windows::UI::Text;
|
|
using namespace winrt::Windows::Foundation;
|
|
using namespace winrt::Windows::Foundation::Collections;
|
|
using namespace winrt::Microsoft::Terminal::Settings::Model;
|
|
|
|
namespace winrt::TerminalApp::implementation
|
|
{
|
|
// Our control exposes a "Text" property to be used with Data Binding
|
|
// To allow this we need to register a Dependency Property Identifier to be used by the property system
|
|
// (https://docs.microsoft.com/en-us/windows/uwp/xaml-platform/custom-dependency-properties)
|
|
DependencyProperty HighlightedTextControl::_textProperty = DependencyProperty::Register(
|
|
L"Text",
|
|
xaml_typename<winrt::TerminalApp::HighlightedText>(),
|
|
xaml_typename<winrt::TerminalApp::HighlightedTextControl>(),
|
|
PropertyMetadata(nullptr, HighlightedTextControl::_onTextChanged));
|
|
|
|
HighlightedTextControl::HighlightedTextControl()
|
|
{
|
|
InitializeComponent();
|
|
}
|
|
|
|
// Method Description:
|
|
// - Returns the Identifier of the "Text" dependency property
|
|
DependencyProperty HighlightedTextControl::TextProperty()
|
|
{
|
|
return _textProperty;
|
|
}
|
|
|
|
// Method Description:
|
|
// - Returns the TextBlock view used to render the highlighted text
|
|
// Can be used when the Text property change is triggered by the event system to update the view
|
|
// We need to expose it rather than simply bind a data source because we update the runs in code-behind
|
|
Controls::TextBlock HighlightedTextControl::TextView()
|
|
{
|
|
return _textView();
|
|
}
|
|
|
|
winrt::TerminalApp::HighlightedText HighlightedTextControl::Text()
|
|
{
|
|
return winrt::unbox_value<winrt::TerminalApp::HighlightedText>(GetValue(_textProperty));
|
|
}
|
|
|
|
void HighlightedTextControl::Text(winrt::TerminalApp::HighlightedText const& value)
|
|
{
|
|
SetValue(_textProperty, winrt::box_value(value));
|
|
}
|
|
|
|
// Method Description:
|
|
// - This callback is triggered when the Text property is changed. Responsible for updating the view
|
|
// Arguments:
|
|
// - o - dependency object that was modified, expected to be an instance of this control
|
|
// - e - event arguments of the property changed event fired by the event system upon Text property change.
|
|
// The new value is expected to be an instance of HighlightedText
|
|
void HighlightedTextControl::_onTextChanged(DependencyObject const& o, DependencyPropertyChangedEventArgs const& e)
|
|
{
|
|
const auto control = o.try_as<winrt::TerminalApp::HighlightedTextControl>();
|
|
const auto highlightedText = e.NewValue().try_as<winrt::TerminalApp::HighlightedText>();
|
|
|
|
if (control && highlightedText)
|
|
{
|
|
// Replace all the runs on the TextBlock
|
|
// Use IsHighlighted to decide if the run should be highlighted.
|
|
// To do - export the highlighting style into XAML
|
|
const auto inlinesCollection = control.TextView().Inlines();
|
|
inlinesCollection.Clear();
|
|
|
|
for (const auto& match : highlightedText.Segments())
|
|
{
|
|
const auto matchText = match.TextSegment();
|
|
const auto fontWeight = match.IsHighlighted() ? FontWeights::Bold() : FontWeights::Normal();
|
|
|
|
Documents::Run run;
|
|
run.Text(matchText);
|
|
run.FontWeight(fontWeight);
|
|
inlinesCollection.Append(run);
|
|
}
|
|
}
|
|
}
|
|
}
|