raise the event relative to the sender

This commit is contained in:
Mike Griese
2023-08-08 10:09:58 -05:00
parent 0cf6475bd7
commit 902ee8eb33
3 changed files with 9 additions and 8 deletions

View File

@@ -4691,7 +4691,7 @@ namespace winrt::TerminalApp::implementation
_updateThemeColors();
}
winrt::fire_and_forget TerminalPage::_ControlCompletionsChangedHandler(const IInspectable /*sender*/,
winrt::fire_and_forget TerminalPage::_ControlCompletionsChangedHandler(const IInspectable sender,
const CompletionsChangedEventArgs args)
{
// This will come in on a background (not-UI, not output) thread.
@@ -4713,20 +4713,22 @@ namespace winrt::TerminalApp::implementation
args.ReplacementLength());
auto weakThis{ get_weak() };
Dispatcher().RunAsync(CoreDispatcherPriority::Normal, [weakThis, commandsCollection]() {
Dispatcher().RunAsync(CoreDispatcherPriority::Normal, [weakThis, commandsCollection, sender]() {
// On the UI thread...
if (const auto& page{ weakThis.get() })
{
// Open the Suggestions UI with the commands from the control
page->_OpenSuggestions(commandsCollection, SuggestionsMode::Menu);
page->_OpenSuggestions(sender.try_as<TermControl>(), commandsCollection, SuggestionsMode::Menu);
}
});
}
CATCH_LOG();
}
void TerminalPage::_OpenSuggestions(IVector<Command> commandsCollection,
winrt::TerminalApp::SuggestionsMode mode)
void TerminalPage::_OpenSuggestions(
const TermControl& sender,
IVector<Command> commandsCollection,
winrt::TerminalApp::SuggestionsMode mode)
{
// ON THE UI THREAD
assert(Dispatcher().HasThreadAccess());
@@ -4744,7 +4746,7 @@ namespace winrt::TerminalApp::implementation
return;
}
const auto& control{ _GetActiveControl() };
const auto& control{ sender ? sender : _GetActiveControl() };
if (!control)
{
return;

View File

@@ -519,7 +519,7 @@ namespace winrt::TerminalApp::implementation
void _updatePaneResources(const winrt::Windows::UI::Xaml::ElementTheme& requestedTheme);
winrt::fire_and_forget _ControlCompletionsChangedHandler(const winrt::Windows::Foundation::IInspectable sender, const winrt::Microsoft::Terminal::Control::CompletionsChangedEventArgs args);
void _OpenSuggestions(Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Model::Command> commandsCollection, winrt::TerminalApp::SuggestionsMode mode);
void _OpenSuggestions(const Microsoft::Terminal::Control::TermControl& sender, Windows::Foundation::Collections::IVector<winrt::Microsoft::Terminal::Settings::Model::Command> commandsCollection, winrt::TerminalApp::SuggestionsMode mode);
void _ShowWindowChangedHandler(const IInspectable sender, const winrt::Microsoft::Terminal::Control::ShowWindowArgs args);

View File

@@ -816,7 +816,6 @@ namespace winrt::Microsoft::Terminal::Settings::Model::factory_implementation
BASIC_FACTORY(RenameTabArgs);
BASIC_FACTORY(SwapPaneArgs);
BASIC_FACTORY(SplitPaneArgs);
BASIC_FACTORY(SendInputArgs);
BASIC_FACTORY(SetFocusModeArgs);
BASIC_FACTORY(SetFullScreenArgs);
BASIC_FACTORY(SetMaximizedArgs);