openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fixed first button in dialog without attached key being triggered by any unknown key

Browse Source
This commit is contained in:
Celtic Minstrel
2014-04-14 17:03:05 -04:00
parent 48f3335160
commit db98f6245e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osx/boe.actions.cpp
View File

@@ -1584,6 +1584,7 @@ char keyToChar(sf::Keyboard::Key key, bool isShift) {
case kb::BackSpace: return '\b'; case kb::BackSpace: return '\b';
case kb::Delete: return '\x7f'; case kb::Delete: return '\x7f';
} }
return 0;
} }
bool handle_keystroke(sf::Event& event){ bool handle_keystroke(sf::Event& event){

2
osx/dialogxml/control.cpp
View File

@@ -145,7 +145,7 @@ eKeyMod& operator -= (eKeyMod&lhs, eKeyMod rhs){
bool operator== (cKey a, cKey b){ bool operator== (cKey a, cKey b){
if(a.spec != b.spec) return false; if(a.spec != b.spec) return false;
if(a.mod != b.mod) return false; if(a.mod != b.mod) return false;
return a.spec ? a.k == b.k : a.c == b.c; return a.spec ? a.k == b.k : (a.c == 0 ? false : a.c == b.c);
} }
bool mod_contains(eKeyMod mods, eKeyMod mod) { bool mod_contains(eKeyMod mods, eKeyMod mod) {