mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 02:36:19 +02:00
Change warnings from icon to flyouts but it no longer interrupts searching (#2816)
* 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
This commit is contained in:
@@ -157,6 +157,8 @@ namespace KeyboardManagerHelper
|
||||
return L"Shortcut must contain an action key";
|
||||
case ErrorType::ShortcutNotMoreThanOneActionKey:
|
||||
return L"Shortcut cannot have more than one action key";
|
||||
case ErrorType::ShortcutMaxShortcutSizeOneActionKey:
|
||||
return L"Shortcuts can only have up to 2 modifier keys";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,7 +34,8 @@ namespace KeyboardManagerHelper
|
||||
ShortcutCannotHaveRepeatedModifier,
|
||||
ShortcutAtleast2Keys,
|
||||
ShortcutOneActionKey,
|
||||
ShortcutNotMoreThanOneActionKey
|
||||
ShortcutNotMoreThanOneActionKey,
|
||||
ShortcutMaxShortcutSizeOneActionKey
|
||||
};
|
||||
|
||||
// Enum type to store possible decision for input in the low level hook
|
||||
|
||||
@@ -50,23 +50,21 @@ namespace KeyboardManagerConstants
|
||||
inline const double DefaultEditShortcutsWindowHeight = 0.55;
|
||||
|
||||
// Key Remap table constants
|
||||
inline const long RemapTableColCount = 5;
|
||||
inline const long RemapTableColCount = 4;
|
||||
inline const long RemapTableHeaderCount = 2;
|
||||
inline const long RemapTableOriginalColIndex = 0;
|
||||
inline const long RemapTableArrowColIndex = 1;
|
||||
inline const long RemapTableNewColIndex = 2;
|
||||
inline const long RemapTableRemoveColIndex = 3;
|
||||
inline const long RemapTableWarningColIndex = 4;
|
||||
inline const long RemapTableDropDownWidth = 110;
|
||||
|
||||
// Shortcut table constants
|
||||
inline const long ShortcutTableColCount = 5;
|
||||
inline const long ShortcutTableColCount = 4;
|
||||
inline const long ShortcutTableHeaderCount = 2;
|
||||
inline const long ShortcutTableOriginalColIndex = 0;
|
||||
inline const long ShortcutTableArrowColIndex = 1;
|
||||
inline const long ShortcutTableNewColIndex = 2;
|
||||
inline const long ShortcutTableRemoveColIndex = 3;
|
||||
inline const long ShortcutTableWarningColIndex = 4;
|
||||
inline const long ShortcutTableDropDownWidth = 110;
|
||||
inline const long ShortcutTableDropDownSpacing = 10;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user