OMGeeky/andors-trail
1
0
Fork 0
mirror of https://github.com/OMGeeky/andors-trail.git synced 2026-02-23 15:38:29 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Bugfix - Disable input before the SurfaceView on MainView is created.

Browse Source
This commit is contained in:
Oskar Wiksten
2012-11-10 20:54:17 +01:00
parent d375c1b4d8
commit 76a3259b84
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
AndorsTrail/src/com/gpl/rpg/AndorsTrail/view/MainView.java
View File

@@ -81,7 +81,7 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
@Override
public boolean onKeyDown(int keyCode, KeyEvent msg) {
if (!model.uiSelections.isMainActivityVisible) return true;
if (!canAcceptInput()) return true;
if (inputController.onKeyboardAction(keyCode)) return true;
else return super.onKeyDown(keyCode, msg);
@@ -89,7 +89,7 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
@Override
public boolean onKeyUp(int keyCode, KeyEvent msg) {
if (!model.uiSelections.isMainActivityVisible) return true;
if (!canAcceptInput()) return true;
inputController.onKeyboardCancel();
@@ -128,7 +128,7 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
@Override
public boolean onTouchEvent(MotionEvent event) {
if (!model.uiSelections.isMainActivityVisible) return true;
if (!canAcceptInput()) return true;
switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
@@ -146,6 +146,12 @@ public final class MainView extends SurfaceView implements SurfaceHolder.Callbac
return super.onTouchEvent(event);
}
private boolean canAcceptInput() {
if (!model.uiSelections.isMainActivityVisible) return false;
if (!hasSurface) return false;
return true;
}
public static final int REDRAW_ALL_SURFACE_CHANGED = 1;
public static final int REDRAW_ALL_MAP_CHANGED = 2;
public static final int REDRAW_ALL_PLAYER_MOVED = 3;