Changed output dir to modules and resolved conflicts (#2233)

This commit is contained in:
Arjun Balgovind
2020-04-21 14:14:50 -07:00
committed by GitHub
parent 394f52a725
commit d079f0ca44
12 changed files with 45 additions and 62 deletions

View File

@@ -25,7 +25,7 @@ public:
SingleKeyRemapControl(const size_t rowIndex, const size_t colIndex) :
singleKeyRemapDropDown(rowIndex, colIndex, singleKeyRemapBuffer)
{
typeKey.Content(winrt::box_value(winrt::to_hstring("Type Key")));
typeKey.Content(winrt::box_value(L"Type Key"));
typeKey.Click([&, rowIndex, colIndex](winrt::Windows::Foundation::IInspectable const& sender, RoutedEventArgs const&) {
keyboardManagerState->SetUIState(KeyboardManagerUIState::DetectSingleKeyRemapWindowActivated, EditKeyboardWindowHandle);
// Using the XamlRoot of the typeKey to get the root of the XAML host