Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 02:06:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed overflow in Type Shortcut (#2930)

Browse Source 
* Fixed overflow in Type Shortcut

* hide the stackpanel if it is not required

* changed loop
This commit is contained in:
Arjun Balgovind
2020-05-14 09:23:51 -07:00
committed by GitHub
parent 6f38cdec5a
commit 9d5990311f
4 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/modules/keyboardmanager/common/KeyboardManagerState.cpp
View File

@@ -3,7 +3,7 @@
// Constructor
KeyboardManagerState::KeyboardManagerState() :
uiState(KeyboardManagerUIState::Deactivated), currentUIWindow(nullptr), currentShortcutUI(nullptr), currentSingleKeyUI(nullptr), detectedRemapKey(NULL)
uiState(KeyboardManagerUIState::Deactivated), currentUIWindow(nullptr), currentShortcutUI1(nullptr), currentShortcutUI2(nullptr), currentSingleKeyUI(nullptr), detectedRemapKey(NULL)
{
configFile_mutex = CreateMutex(
NULL, // default security descriptor
@@ -64,7 +64,8 @@ void KeyboardManagerState::ResetUIState()
// Reset the shortcut UI stored variables
std::unique_lock<std::mutex> currentShortcutUI_lock(currentShortcutUI_mutex);
currentShortcutUI = nullptr;
currentShortcutUI1 = nullptr;
currentShortcutUI2 = nullptr;
currentShortcutUI_lock.unlock();
std::unique_lock<std::mutex> detectedShortcut_lock(detectedShortcut_mutex);
@@ -132,10 +133,11 @@ bool KeyboardManagerState::AddSingleKeyRemap(const DWORD& originalKey, const DWO
}
// Function to set the textblock of the detect shortcut UI so that it can be accessed by the hook
void KeyboardManagerState::ConfigureDetectShortcutUI(const StackPanel& textBlock)
void KeyboardManagerState::ConfigureDetectShortcutUI(const StackPanel& textBlock1, const StackPanel& textBlock2)
{
std::lock_guard<std::mutex> lock(currentShortcutUI_mutex);
currentShortcutUI = textBlock;
currentShortcutUI1 = textBlock1;
currentShortcutUI2 = textBlock2;
}
// Function to set the textblock of the detect remap key UI so that it can be accessed by the hook
@@ -167,7 +169,7 @@ void KeyboardManagerState::AddKeyToLayout(const StackPanel& panel, const hstring
void KeyboardManagerState::UpdateDetectShortcutUI()
{
std::lock_guard<std::mutex> currentShortcutUI_lock(currentShortcutUI_mutex);
if (currentShortcutUI == nullptr)
if (currentShortcutUI1 == nullptr)
{
return;
}
@@ -181,14 +183,36 @@ void KeyboardManagerState::UpdateDetectShortcutUI()
detectedShortcut_lock.unlock();
// Since this function is invoked from the back-end thread, in order to update the UI the dispatcher must be used.
currentShortcutUI.Dispatcher().RunAsync(Windows::UI::Core::CoreDispatcherPriority::Normal, [this, detectedShortcutCopy]() {
currentShortcutUI1.Dispatcher().RunAsync(Windows::UI::Core::CoreDispatcherPriority::Normal, [this, detectedShortcutCopy]() {
std::vector<hstring> shortcut = detectedShortcutCopy.GetKeyVector(keyboardMap);
currentShortcutUI.Children().Clear();
for (auto& key : shortcut)
currentShortcutUI1.Children().Clear();
currentShortcutUI2.Children().Clear();
// The second row should be hidden if there are 3 keys or lesser to avoid an extra margin
if (shortcut.size() > 3)
{
AddKeyToLayout(currentShortcutUI, key);
currentShortcutUI2.Visibility(Visibility::Visible);
}
currentShortcutUI.UpdateLayout();
else
{
currentShortcutUI2.Visibility(Visibility::Collapsed);
}
int i = 0;
for (int i = 0; i < shortcut.size(); i++)
{
if (i < 3)
{
AddKeyToLayout(currentShortcutUI1, shortcut[i]);
}
else
{
AddKeyToLayout(currentShortcutUI2, shortcut[i]);
}
i++;
}
currentShortcutUI1.UpdateLayout();
currentShortcutUI2.UpdateLayout();
});
}
@@ -381,7 +405,7 @@ bool KeyboardManagerState::SaveConfigToFile()
json::JsonArray inProcessRemapKeysArray;
json::JsonArray globalRemapShortcutsArray;
std::unique_lock<std::mutex> lockSingleKeyReMap(singleKeyReMap_mutex);
for (const auto &it : singleKeyReMap)
for (const auto& it : singleKeyReMap)
{
json::JsonObject keys;
keys.SetNamedValue(KeyboardManagerConstants::OriginalKeysSettingName, json::value(winrt::to_hstring((unsigned int)it.first)));
@@ -392,7 +416,7 @@ bool KeyboardManagerState::SaveConfigToFile()
lockSingleKeyReMap.unlock();
std::unique_lock<std::mutex> lockOsLevelShortcutReMap(osLevelShortcutReMap_mutex);
for (const auto &it : osLevelShortcutReMap)
for (const auto& it : osLevelShortcutReMap)
{
json::JsonObject keys;
keys.SetNamedValue(KeyboardManagerConstants::OriginalKeysSettingName, json::value(it.first.ToHstringVK()));