mirror of
https://github.com/microsoft/PowerToys.git
synced 2024-12-28 03:48:30 +08:00
592c55c524
* Fixed foreground issue and added arrow * Tweaked Remap Keyboard UI * Fix errors in warning handling and update UI layout * Tweaked sizes and centered to screen * Fixed flyouts appearing on search for Single key remaps * Fixed flyouts appearing on search for Shortcut remaps * Remove warning exclamation icon and tooltip * Fixed a bug where setting None on a drop down which would create a shortcut with a conflict would cause a crash * Remove IsTypeKey logic * Changed warning text * Resolve comments
275 lines
14 KiB
C++
275 lines
14 KiB
C++
#include "pch.h"
|
|
#include "SingleKeyRemapControl.h"
|
|
#include "keyboardmanager/common/Helpers.h"
|
|
|
|
//Both static members are initialized to null
|
|
HWND SingleKeyRemapControl::EditKeyboardWindowHandle = nullptr;
|
|
KeyboardManagerState* SingleKeyRemapControl::keyboardManagerState = nullptr;
|
|
// Initialized as new vector
|
|
std::vector<std::vector<DWORD>> SingleKeyRemapControl::singleKeyRemapBuffer;
|
|
|
|
// Function to add a new row to the remap keys table. If the originalKey and newKey args are provided, then the displayed remap keys are set to those values.
|
|
void SingleKeyRemapControl::AddNewControlKeyRemapRow(Grid& parent, std::vector<std::vector<std::unique_ptr<SingleKeyRemapControl>>>& keyboardRemapControlObjects, const DWORD originalKey, const DWORD newKey)
|
|
{
|
|
// Create new SingleKeyRemapControl objects dynamically so that we does not get destructed
|
|
std::vector<std::unique_ptr<SingleKeyRemapControl>> newrow;
|
|
newrow.push_back(std::move(std::unique_ptr<SingleKeyRemapControl>(new SingleKeyRemapControl(parent, 0))));
|
|
newrow.push_back(std::move(std::unique_ptr<SingleKeyRemapControl>(new SingleKeyRemapControl(parent, 1))));
|
|
keyboardRemapControlObjects.push_back(std::move(newrow));
|
|
|
|
// Add to grid
|
|
parent.RowDefinitions().Append(RowDefinition());
|
|
parent.SetColumn(keyboardRemapControlObjects[keyboardRemapControlObjects.size() - 1][0]->getSingleKeyRemapControl(), KeyboardManagerConstants::RemapTableOriginalColIndex);
|
|
parent.SetRow(keyboardRemapControlObjects[keyboardRemapControlObjects.size() - 1][0]->getSingleKeyRemapControl(), parent.RowDefinitions().Size() - 1);
|
|
parent.SetColumn(keyboardRemapControlObjects[keyboardRemapControlObjects.size() - 1][1]->getSingleKeyRemapControl(), KeyboardManagerConstants::RemapTableNewColIndex);
|
|
parent.SetRow(keyboardRemapControlObjects[keyboardRemapControlObjects.size() - 1][1]->getSingleKeyRemapControl(), parent.RowDefinitions().Size() - 1);
|
|
// SingleKeyRemapControl for the original key.
|
|
parent.Children().Append(keyboardRemapControlObjects[keyboardRemapControlObjects.size() - 1][0]->getSingleKeyRemapControl());
|
|
|
|
// Arrow icon
|
|
FontIcon arrowIcon;
|
|
arrowIcon.FontFamily(Xaml::Media::FontFamily(L"Segoe MDL2 Assets"));
|
|
arrowIcon.Glyph(L"\xE72A");
|
|
arrowIcon.VerticalAlignment(VerticalAlignment::Center);
|
|
arrowIcon.HorizontalAlignment(HorizontalAlignment::Center);
|
|
parent.SetColumn(arrowIcon, KeyboardManagerConstants::RemapTableArrowColIndex);
|
|
parent.SetRow(arrowIcon, parent.RowDefinitions().Size() - 1);
|
|
parent.Children().Append(arrowIcon);
|
|
|
|
// SingleKeyRemapControl for the new remap key
|
|
parent.Children().Append(keyboardRemapControlObjects[keyboardRemapControlObjects.size() - 1][1]->getSingleKeyRemapControl());
|
|
|
|
// Set the key text if the two keys are not null (i.e. default args)
|
|
if (originalKey != NULL && newKey != NULL)
|
|
{
|
|
singleKeyRemapBuffer.push_back(std::vector<DWORD>{ originalKey, newKey });
|
|
std::vector<DWORD> keyCodes = keyboardManagerState->keyboardMap.GetKeyCodeList();
|
|
auto it = std::find(keyCodes.begin(), keyCodes.end(), originalKey);
|
|
if (it != keyCodes.end())
|
|
{
|
|
keyboardRemapControlObjects[keyboardRemapControlObjects.size() - 1][0]->singleKeyRemapDropDown.SetSelectedIndex((int32_t)std::distance(keyCodes.begin(), it));
|
|
}
|
|
it = std::find(keyCodes.begin(), keyCodes.end(), newKey);
|
|
if (it != keyCodes.end())
|
|
{
|
|
keyboardRemapControlObjects[keyboardRemapControlObjects.size() - 1][1]->singleKeyRemapDropDown.SetSelectedIndex((int32_t)std::distance(keyCodes.begin(), it));
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// Initialize both keys to NULL
|
|
singleKeyRemapBuffer.push_back(std::vector<DWORD>{ NULL, NULL });
|
|
}
|
|
|
|
// Delete row button
|
|
Windows::UI::Xaml::Controls::Button deleteRemapKeys;
|
|
FontIcon deleteSymbol;
|
|
deleteSymbol.FontFamily(Xaml::Media::FontFamily(L"Segoe MDL2 Assets"));
|
|
deleteSymbol.Glyph(L"\xE74D");
|
|
deleteRemapKeys.Content(deleteSymbol);
|
|
deleteRemapKeys.Background(Media::SolidColorBrush(Colors::Transparent()));
|
|
deleteRemapKeys.HorizontalAlignment(HorizontalAlignment::Center);
|
|
deleteRemapKeys.Click([&](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
|
|
Button currentButton = sender.as<Button>();
|
|
uint32_t index;
|
|
// Get index of delete button
|
|
UIElementCollection children = parent.Children();
|
|
children.IndexOf(currentButton, index);
|
|
uint32_t lastIndexInRow = index + ((KeyboardManagerConstants::RemapTableColCount - 1) - KeyboardManagerConstants::RemapTableRemoveColIndex);
|
|
// Change the row index of elements appearing after the current row, as we will delete the row definition
|
|
for (uint32_t i = lastIndexInRow + 1; i < children.Size(); i++)
|
|
{
|
|
int32_t elementRowIndex = parent.GetRow(children.GetAt(i).as<FrameworkElement>());
|
|
parent.SetRow(children.GetAt(i).as<FrameworkElement>(), elementRowIndex - 1);
|
|
}
|
|
|
|
for (int i = 0; i < KeyboardManagerConstants::RemapTableColCount; i++)
|
|
{
|
|
parent.Children().RemoveAt(lastIndexInRow - i);
|
|
}
|
|
|
|
// Calculate row index in the buffer from the grid child index (first two children are header elements and then three children in each row)
|
|
int bufferIndex = (lastIndexInRow - KeyboardManagerConstants::RemapTableHeaderCount) / KeyboardManagerConstants::RemapTableColCount;
|
|
// Delete the row definition
|
|
parent.RowDefinitions().RemoveAt(bufferIndex + 1);
|
|
// delete the row from the buffer.
|
|
singleKeyRemapBuffer.erase(singleKeyRemapBuffer.begin() + bufferIndex);
|
|
// delete the SingleKeyRemapControl objects so that they get destructed
|
|
keyboardRemapControlObjects.erase(keyboardRemapControlObjects.begin() + bufferIndex);
|
|
});
|
|
parent.SetColumn(deleteRemapKeys, KeyboardManagerConstants::RemapTableRemoveColIndex);
|
|
parent.SetRow(deleteRemapKeys, parent.RowDefinitions().Size() - 1);
|
|
parent.Children().Append(deleteRemapKeys);
|
|
parent.UpdateLayout();
|
|
}
|
|
|
|
// Function to return the stack panel element of the SingleKeyRemapControl. This is the externally visible UI element which can be used to add it to other layouts
|
|
StackPanel SingleKeyRemapControl::getSingleKeyRemapControl()
|
|
{
|
|
return singleKeyRemapControlLayout;
|
|
}
|
|
|
|
// Function to create the detect remap key UI window
|
|
void SingleKeyRemapControl::createDetectKeyWindow(winrt::Windows::Foundation::IInspectable const& sender, XamlRoot xamlRoot, std::vector<std::vector<DWORD>>& singleKeyRemapBuffer, KeyboardManagerState& keyboardManagerState)
|
|
{
|
|
// ContentDialog for detecting remap key. This is the parent UI element.
|
|
ContentDialog detectRemapKeyBox;
|
|
|
|
// ContentDialog requires manually setting the XamlRoot (https://docs.microsoft.com/en-us/uwp/api/windows.ui.xaml.controls.contentdialog#contentdialog-in-appwindow-or-xaml-islands)
|
|
detectRemapKeyBox.XamlRoot(xamlRoot);
|
|
detectRemapKeyBox.Title(box_value(L"Press a key on selected keyboard:"));
|
|
detectRemapKeyBox.IsPrimaryButtonEnabled(false);
|
|
detectRemapKeyBox.IsSecondaryButtonEnabled(false);
|
|
|
|
// Get the linked text block for the "Type Key" button that was clicked
|
|
ComboBox linkedRemapDropDown = KeyboardManagerHelper::getSiblingElement(sender).as<ComboBox>();
|
|
|
|
auto unregisterKeys = [&keyboardManagerState]() {
|
|
std::thread t1(&KeyboardManagerState::UnregisterKeyDelay, &keyboardManagerState, VK_ESCAPE);
|
|
std::thread t2(&KeyboardManagerState::UnregisterKeyDelay, &keyboardManagerState, VK_RETURN);
|
|
t1.detach();
|
|
t2.detach();
|
|
};
|
|
|
|
auto onAccept = [linkedRemapDropDown,
|
|
detectRemapKeyBox,
|
|
&keyboardManagerState,
|
|
&singleKeyRemapBuffer,
|
|
unregisterKeys] {
|
|
// Save the detected key in the linked text block
|
|
DWORD detectedKey = keyboardManagerState.GetDetectedSingleRemapKey();
|
|
|
|
if (detectedKey != NULL)
|
|
{
|
|
std::vector<DWORD> keyCodeList = keyboardManagerState.keyboardMap.GetKeyCodeList();
|
|
// Update the drop down list with the new language to ensure that the correct key is displayed
|
|
linkedRemapDropDown.ItemsSource(KeyboardManagerHelper::ToBoxValue(keyboardManagerState.keyboardMap.GetKeyNameList()));
|
|
auto it = std::find(keyCodeList.begin(), keyCodeList.end(), detectedKey);
|
|
if (it != keyCodeList.end())
|
|
{
|
|
linkedRemapDropDown.SelectedIndex((int32_t)std::distance(keyCodeList.begin(), it));
|
|
}
|
|
}
|
|
|
|
// Reset the keyboard manager UI state
|
|
keyboardManagerState.ResetUIState();
|
|
// Revert UI state back to Edit Keyboard window
|
|
keyboardManagerState.SetUIState(KeyboardManagerUIState::EditKeyboardWindowActivated, EditKeyboardWindowHandle);
|
|
unregisterKeys();
|
|
detectRemapKeyBox.Hide();
|
|
};
|
|
|
|
TextBlock primaryButtonText;
|
|
primaryButtonText.Text(L"OK");
|
|
|
|
Button primaryButton;
|
|
primaryButton.HorizontalAlignment(HorizontalAlignment::Stretch);
|
|
primaryButton.Margin({ 2, 2, 2, 2 });
|
|
primaryButton.Content(primaryButtonText);
|
|
primaryButton.Click([onAccept](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
|
|
onAccept();
|
|
});
|
|
|
|
keyboardManagerState.RegisterKeyDelay(
|
|
VK_RETURN,
|
|
std::bind(&KeyboardManagerState::SelectDetectedRemapKey, &keyboardManagerState, std::placeholders::_1),
|
|
[primaryButton, detectRemapKeyBox](DWORD) {
|
|
detectRemapKeyBox.Dispatcher().RunAsync(
|
|
Windows::UI::Core::CoreDispatcherPriority::Normal,
|
|
[primaryButton] {
|
|
// Use the base medium low brush to be consistent with the theme
|
|
primaryButton.Background(Windows::UI::Xaml::Application::Current().Resources().Lookup(box_value(L"SystemControlBackgroundBaseMediumLowBrush")).as<Windows::UI::Xaml::Media::SolidColorBrush>());
|
|
});
|
|
},
|
|
[onAccept, detectRemapKeyBox](DWORD) {
|
|
detectRemapKeyBox.Dispatcher().RunAsync(
|
|
Windows::UI::Core::CoreDispatcherPriority::Normal,
|
|
[onAccept] {
|
|
onAccept();
|
|
});
|
|
});
|
|
|
|
TextBlock cancelButtonText;
|
|
cancelButtonText.Text(L"Cancel");
|
|
|
|
Button cancelButton;
|
|
cancelButton.HorizontalAlignment(HorizontalAlignment::Stretch);
|
|
cancelButton.Margin({ 2, 2, 2, 2 });
|
|
cancelButton.Content(cancelButtonText);
|
|
// Cancel button
|
|
cancelButton.Click([detectRemapKeyBox, unregisterKeys, &keyboardManagerState](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
|
|
// Reset the keyboard manager UI state
|
|
keyboardManagerState.ResetUIState();
|
|
// Revert UI state back to Edit Keyboard window
|
|
keyboardManagerState.SetUIState(KeyboardManagerUIState::EditKeyboardWindowActivated, EditKeyboardWindowHandle);
|
|
unregisterKeys();
|
|
detectRemapKeyBox.Hide();
|
|
});
|
|
|
|
keyboardManagerState.RegisterKeyDelay(
|
|
VK_ESCAPE,
|
|
std::bind(&KeyboardManagerState::SelectDetectedRemapKey, &keyboardManagerState, std::placeholders::_1),
|
|
[&keyboardManagerState, detectRemapKeyBox, unregisterKeys](DWORD) {
|
|
detectRemapKeyBox.Dispatcher().RunAsync(
|
|
Windows::UI::Core::CoreDispatcherPriority::Normal,
|
|
[detectRemapKeyBox] {
|
|
detectRemapKeyBox.Hide();
|
|
});
|
|
|
|
keyboardManagerState.ResetUIState();
|
|
// Revert UI state back to Edit Keyboard window
|
|
keyboardManagerState.SetUIState(KeyboardManagerUIState::EditKeyboardWindowActivated, EditKeyboardWindowHandle);
|
|
unregisterKeys();
|
|
},
|
|
nullptr);
|
|
|
|
// StackPanel parent for the displayed text in the dialog
|
|
Windows::UI::Xaml::Controls::StackPanel stackPanel;
|
|
detectRemapKeyBox.Content(stackPanel);
|
|
|
|
// Header textblock
|
|
TextBlock text;
|
|
text.Text(L"Key Pressed:");
|
|
text.Margin({ 0, 0, 0, 10 });
|
|
stackPanel.Children().Append(text);
|
|
|
|
// Target StackPanel to place the selected key
|
|
Windows::UI::Xaml::Controls::StackPanel keyStackPanel;
|
|
keyStackPanel.Orientation(Orientation::Horizontal);
|
|
stackPanel.Children().Append(keyStackPanel);
|
|
|
|
TextBlock holdEscInfo;
|
|
holdEscInfo.Text(L"Hold Esc to discard");
|
|
holdEscInfo.FontSize(12);
|
|
holdEscInfo.Margin({ 0, 20, 0, 0 });
|
|
stackPanel.Children().Append(holdEscInfo);
|
|
|
|
TextBlock holdEnterInfo;
|
|
holdEnterInfo.Text(L"Hold Enter to apply");
|
|
holdEnterInfo.FontSize(12);
|
|
holdEnterInfo.Margin({ 0, 0, 0, 0 });
|
|
stackPanel.Children().Append(holdEnterInfo);
|
|
|
|
ColumnDefinition primaryButtonColumn;
|
|
ColumnDefinition cancelButtonColumn;
|
|
|
|
Grid buttonPanel;
|
|
buttonPanel.Margin({ 0, 20, 0, 0 });
|
|
buttonPanel.HorizontalAlignment(HorizontalAlignment::Stretch);
|
|
buttonPanel.ColumnDefinitions().Append(primaryButtonColumn);
|
|
buttonPanel.ColumnDefinitions().Append(cancelButtonColumn);
|
|
buttonPanel.SetColumn(primaryButton, 0);
|
|
buttonPanel.SetColumn(cancelButton, 1);
|
|
|
|
buttonPanel.Children().Append(primaryButton);
|
|
buttonPanel.Children().Append(cancelButton);
|
|
|
|
stackPanel.Children().Append(buttonPanel);
|
|
stackPanel.UpdateLayout();
|
|
|
|
// Configure the keyboardManagerState to store the UI information.
|
|
keyboardManagerState.ConfigureDetectSingleKeyRemapUI(keyStackPanel);
|
|
|
|
// Show the dialog
|
|
detectRemapKeyBox.ShowAsync();
|
|
} |