diff options
| author | 2024-06-08 20:03:38 +0000 | |
|---|---|---|
| committer | 2024-06-08 20:03:38 +0000 | |
| commit | aa8e0640e68c596ac71a1369803c90def78eb7eb (patch) | |
| tree | 7ee867ff3cad2fc711066d728c9f74818f994a8a /libs/input/InputDevice.cpp | |
| parent | 61eb25360c8e43ce7a4d124aac7b34b62b611d73 (diff) | |
| parent | 2e73b2a3aae5f9e5a3d649139aad01921da7bfba (diff) | |
Merge changes I02bc2802,I52773be9 into main
* changes:
Implement basic functionality for rust keyboard classifier
Implement KeyboardClassifier interface in rust
Diffstat (limited to 'libs/input/InputDevice.cpp')
| -rw-r--r-- | libs/input/InputDevice.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libs/input/InputDevice.cpp b/libs/input/InputDevice.cpp index bc678103c2..9333ab83a6 100644 --- a/libs/input/InputDevice.cpp +++ b/libs/input/InputDevice.cpp @@ -273,10 +273,7 @@ void InputDeviceInfo::addLightInfo(const InputDeviceLightInfo& info) { } void InputDeviceInfo::setKeyboardType(int32_t keyboardType) { - static_assert(AINPUT_KEYBOARD_TYPE_NONE < AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC); - static_assert(AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC < AINPUT_KEYBOARD_TYPE_ALPHABETIC); - // There can be multiple subdevices with different keyboard types, set it to the highest type - mKeyboardType = std::max(mKeyboardType, keyboardType); + mKeyboardType = keyboardType; } void InputDeviceInfo::setKeyboardLayoutInfo(KeyboardLayoutInfo layoutInfo) { |