matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent weirdness when ctrl/shift/alt key event is canceled

Browse Source
This commit is contained in:
jacob1 2019-02-24 15:29:02 -05:00
parent 1536736b33
commit 79aef1dab6
1 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/gui/game/GameView.cpp
View File

@ -1646,18 +1646,6 @@ void GameView::OnKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl,
{ {
switch (key) switch (key)
{ {
case SDLK_LALT:
case SDLK_RALT:
enableAltBehaviour();
break;
case SDLK_LCTRL:
case SDLK_RCTRL:
enableCtrlBehaviour();
break;
case SDLK_LSHIFT:
case SDLK_RSHIFT:
enableShiftBehaviour();
break;
case SDLK_TAB: //Tab case SDLK_TAB: //Tab
c->ChangeBrush(); c->ChangeBrush();
break; break;
@ -1691,21 +1679,6 @@ void GameView::OnKeyRelease(int key, int scan, bool repeat, bool shift, bool ctr
c->SetZoomEnabled(false); c->SetZoomEnabled(false);
return; return;
} }
switch(key)
{
case SDLK_LALT:
case SDLK_RALT:
disableAltBehaviour();
break;
case SDLK_LCTRL:
case SDLK_RCTRL:
disableCtrlBehaviour();
break;
case SDLK_LSHIFT:
case SDLK_RSHIFT:
disableShiftBehaviour();
break;
}
} }
void GameView::OnBlur() void GameView::OnBlur()
@ -1857,13 +1830,25 @@ void GameView::DoTextInput(String text)
void GameView::DoKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, bool alt) void GameView::DoKeyPress(int key, int scan, bool repeat, bool shift, bool ctrl, bool alt)
{ {
if (shift && !shiftBehaviour)
enableShiftBehaviour();
if (ctrl && !ctrlBehaviour)
enableCtrlBehaviour();
if (alt && !altBehaviour)
enableAltBehaviour();
if (c->KeyPress(key, scan, repeat, shift, ctrl, alt)) if (c->KeyPress(key, scan, repeat, shift, ctrl, alt))
Window::DoKeyPress(key, scan, repeat, shift, ctrl, alt); Window::DoKeyPress(key, scan, repeat, shift, ctrl, alt);
} }
void GameView::DoKeyRelease(int key, int scan, bool repeat, bool shift, bool ctrl, bool alt) void GameView::DoKeyRelease(int key, int scan, bool repeat, bool shift, bool ctrl, bool alt)
{ {
if(c->KeyRelease(key, scan, repeat, shift, ctrl, alt)) if (!shift && shiftBehaviour)
disableShiftBehaviour();
if (!ctrl && ctrlBehaviour)
disableCtrlBehaviour();
if (!alt && altBehaviour)
disableAltBehaviour();
if (c->KeyRelease(key, scan, repeat, shift, ctrl, alt))
Window::DoKeyRelease(key, scan, repeat, shift, ctrl, alt); Window::DoKeyRelease(key, scan, repeat, shift, ctrl, alt);
} }