Fixup for previous commit.

This commit is contained in:
Dario Manesku 2015-03-08 01:17:49 +01:00
parent 81b9086de5
commit 2443718b9f

View file

@ -308,8 +308,13 @@ namespace entry
{ {
m_eventQueue.postExitEvent(); m_eventQueue.postExitEvent();
} }
else if (0 != (modifiers & (Modifier::LeftShift|Modifier::RightShift) ) else
&& ( (Key::Key0 <= key && key <= Key::KeyZ) || (Key::Esc <= key && key <= Key::Minus) ) ) {
enum { ShiftMask = Modifier::LeftShift|Modifier::RightShift };
const bool nonShiftModifiers = (0 != (modifiers&(~ShiftMask) ) );
const bool isCharPressed = (Key::Key0 <= key && key <= Key::KeyZ) || (Key::Esc <= key && key <= Key::Minus) ;
const bool isText = isCharPressed && !nonShiftModifiers;
if (isText)
{ {
m_eventQueue.postCharEvent(s_defaultWindow, 1, pressedChar); m_eventQueue.postCharEvent(s_defaultWindow, 1, pressedChar);
return false; return false;
@ -320,6 +325,7 @@ namespace entry
return false; return false;
} }
} }
}
break; break;
} }