Fix input bind priority
This commit is contained in:
parent
bf7418073d
commit
5df9adcd0e
@ -57,10 +57,16 @@ KeyMod keyModsFromJson(Json const& json, uint8_t* priority = nullptr) {
|
|||||||
if (!json.isType(Json::Type::Array))
|
if (!json.isType(Json::Type::Array))
|
||||||
return mod;
|
return mod;
|
||||||
|
|
||||||
|
uint8_t modPriority = 0;
|
||||||
for (Json const& jMod : json.toArray()) {
|
for (Json const& jMod : json.toArray()) {
|
||||||
if (mod != (mod |= KeyModNames.getLeft(jMod.toString())) && priority)
|
KeyMod changedMod = mod | KeyModNames.getLeft(jMod.toString());
|
||||||
++*priority;
|
if (mod != changedMod) {
|
||||||
|
mod = changedMod;
|
||||||
|
++modPriority;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if (priority)
|
||||||
|
*priority = modPriority;
|
||||||
|
|
||||||
return mod;
|
return mod;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user