summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-07-30 10:51:42 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-07-30 10:51:42 (GMT)
commit303b546ceb134df48763730cbfd8ce7b6df008a2 (patch)
tree6342d25a285fa1c73407511c2b5f6e6d5601ad0a /src/game
parent6d5388b221cdd37fe0103e9074edc052053847af (diff)
downloadpowder-303b546ceb134df48763730cbfd8ce7b6df008a2.zip
powder-303b546ceb134df48763730cbfd8ce7b6df008a2.tar.gz
Ensure CTRL, SHIFT and ALT states are reset when Window falls into background
Diffstat (limited to 'src/game')
-rw-r--r--src/game/GameView.cpp7
-rw-r--r--src/game/GameView.h7
2 files changed, 10 insertions, 4 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 610e3ca..d86f2b6 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -1035,6 +1035,13 @@ void GameView::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bo
}
}
+void GameView::OnBlur()
+{
+ disableAltBehaviour();
+ disableCtrlBehaviour();
+ disableShiftBehaviour();
+}
+
void GameView::OnTick(float dt)
{
if(selectMode==PlaceSave && !placeSaveThumb)
diff --git a/src/game/GameView.h b/src/game/GameView.h
index b9c0604..4c0ad85 100644
--- a/src/game/GameView.h
+++ b/src/game/GameView.h
@@ -148,6 +148,9 @@ public:
virtual void OnMouseWheel(int x, int y, int d);
virtual void OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt);
virtual void OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt);
+ virtual void OnTick(float dt);
+ virtual void OnDraw();
+ virtual void OnBlur();
//Top-level handers, for Lua interface
virtual void DoDraw();
@@ -158,10 +161,6 @@ public:
virtual void DoKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt);
virtual void DoKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt);
- //virtual void OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt) {}
- //virtual void OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt) {}
- virtual void OnTick(float dt);
- virtual void OnDraw();
class MenuAction;
class ToolAction;
};