|
|
@ -2420,13 +2420,8 @@ bool Core::SelectHotkey(int sym, int modifiers)
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!binding.focus.empty()) {
|
|
|
|
if (!binding.focus.empty()) {
|
|
|
|
bool found = false;
|
|
|
|
if (!Gui::matchFocusString(binding.focus)) {
|
|
|
|
std::vector<std::string> focusStrings = Gui::getCurFocus(true);
|
|
|
|
std::vector<std::string> focusStrings = Gui::getCurFocus(true);
|
|
|
|
if(Gui::matchFocusString(binding.focus)) {
|
|
|
|
|
|
|
|
found = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!found) {
|
|
|
|
|
|
|
|
DEBUG(keybinding).print("skipping keybinding due to focus string mismatch: '%s' !~ '%s'\n",
|
|
|
|
DEBUG(keybinding).print("skipping keybinding due to focus string mismatch: '%s' !~ '%s'\n",
|
|
|
|
join_strings(", ", focusStrings).c_str(), binding.focus.c_str());
|
|
|
|
join_strings(", ", focusStrings).c_str(), binding.focus.c_str());
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|