From 7d66c0353cc6bb5e1cd9b8be1408ec4b0ddc7459 Mon Sep 17 00:00:00 2001
From: Sergii Pylypenko <x.pelya.x@gmail.com>
Date: Wed, 24 Apr 2013 21:19:00 +0300
Subject: [PATCH] Fixes to screen keyboard layout dialog.

---
 project/java/Settings.java                    | 24 +++++++++----------
 .../commandergenius/commandergenius           |  2 +-
 .../openarena/AndroidAppSettings.cfg          |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/project/java/Settings.java b/project/java/Settings.java
index f893a1787..a48184241 100644
--- a/project/java/Settings.java
+++ b/project/java/Settings.java
@@ -2065,7 +2065,7 @@ class Settings
 
 				for( int i = 0; i < Globals.ScreenKbControlsLayout.length; i++ )
 				{
-					if( ! Globals.ScreenKbControlsShown[currentButton] )
+					if( ! Globals.ScreenKbControlsShown[i] )
 						continue;
 					if( currentButton == -1 )
 						currentButton = i;
@@ -2089,10 +2089,10 @@ class Settings
 							displayX = dm.widthPixels;
 							displayY = dm.heightPixels;
 						} catch (Exception eeeee) {}
-						Globals.ScreenKbControlsLayout[i][0] = displayX / 2 - displayX / 6;
-						Globals.ScreenKbControlsLayout[i][2] = displayX / 2 + displayX / 6;
-						Globals.ScreenKbControlsLayout[i][1] = displayY / 2 - displayY / 4;
-						Globals.ScreenKbControlsLayout[i][3] = displayY / 2 + displayY / 4;
+						Globals.ScreenKbControlsLayout[i][0] = displayX / 2 - displayX / 10;
+						Globals.ScreenKbControlsLayout[i][2] = displayX / 2 + displayX / 10;
+						Globals.ScreenKbControlsLayout[i][1] = displayY / 2 - displayY / 8;
+						Globals.ScreenKbControlsLayout[i][3] = displayY / 2 + displayY / 8;
 					}
 					RectF dst = new RectF(Globals.ScreenKbControlsLayout[i][0], Globals.ScreenKbControlsLayout[i][1],
 											Globals.ScreenKbControlsLayout[i][2], Globals.ScreenKbControlsLayout[i][3]);
@@ -2133,12 +2133,12 @@ class Settings
 					resizing = true;
 					for( int i = 0; i < Globals.ScreenKbControlsLayout.length; i++ )
 					{
-						if( ! Globals.ScreenKbControlsShown[currentButton] )
+						if( ! Globals.ScreenKbControlsShown[i] )
 							continue;
-						if( Globals.ScreenKbControlsLayout[currentButton][0] <= oldX &&
-							Globals.ScreenKbControlsLayout[currentButton][2] >= oldX &&
-							Globals.ScreenKbControlsLayout[currentButton][1] <= oldY &&
-							Globals.ScreenKbControlsLayout[currentButton][2] >= oldY )
+						if( Globals.ScreenKbControlsLayout[i][0] <= oldX &&
+							Globals.ScreenKbControlsLayout[i][2] >= oldX &&
+							Globals.ScreenKbControlsLayout[i][1] <= oldY &&
+							Globals.ScreenKbControlsLayout[i][3] >= oldY )
 						{
 							currentButton = i;
 							setupButton(currentButton);
@@ -2158,8 +2158,8 @@ class Settings
 						dy /= 6;
 						Globals.ScreenKbControlsLayout[currentButton][0] -= dx;
 						Globals.ScreenKbControlsLayout[currentButton][2] += dx;
-						Globals.ScreenKbControlsLayout[currentButton][1] -= dy;
-						Globals.ScreenKbControlsLayout[currentButton][3] += dy;
+						Globals.ScreenKbControlsLayout[currentButton][1] += dy;
+						Globals.ScreenKbControlsLayout[currentButton][3] -= dy;
 						dx *= 6;
 						dy *= 6;
 					}
diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius
index 108739d28..d1b8a7ae0 160000
--- a/project/jni/application/commandergenius/commandergenius
+++ b/project/jni/application/commandergenius/commandergenius
@@ -1 +1 @@
-Subproject commit 108739d28474c677da9b6caee7da2075a66e0e00
+Subproject commit d1b8a7ae03b1a0960722abbab38bbb8fca98e7cd
diff --git a/project/jni/application/openarena/AndroidAppSettings.cfg b/project/jni/application/openarena/AndroidAppSettings.cfg
index cc8fa67d8..b862d4d64 100644
--- a/project/jni/application/openarena/AndroidAppSettings.cfg
+++ b/project/jni/application/openarena/AndroidAppSettings.cfg
@@ -34,7 +34,7 @@ AppUsesMultitouch=y
 AppRecordsAudio=y
 NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE SPACE NO_REMAP NO_REMAP RETURN ESCAPE LCTRL"
-AppTouchscreenKeyboardKeysAmount=5
+AppTouchscreenKeyboardKeysAmount=6
 AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="SLASH BACKSPACE TAB END LCTRL SPACE UNKNOWN UNKNOWN UNKNOWN UNKNOWN"
 RedefinedKeysScreenKbNames="Change_weapon Sniper_view Show_scores Center_view Fire Jump"