From e9273fc25a962556dcc37c56e868eecf0557db64 Mon Sep 17 00:00:00 2001
From: Lance Ewing <lance.ewing@gmail.com>
Date: Sun, 28 Apr 2024 07:23:49 +0100
Subject: [PATCH] Added the keyboard icon for portrait mode.

---
 core/src/main/java/com/agifans/agile/GameScreen.java |  5 +++--
 .../agifans/agile/ui/GameScreenInputProcessor.java   | 12 ++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/com/agifans/agile/GameScreen.java b/core/src/main/java/com/agifans/agile/GameScreen.java
index a5ec3a3..fff9628 100644
--- a/core/src/main/java/com/agifans/agile/GameScreen.java
+++ b/core/src/main/java/com/agifans/agile/GameScreen.java
@@ -331,8 +331,9 @@ private void draw(float delta) {
         batch.setColor(c.r, c.g, c.b, 0.5f);
         if (viewportManager.isPortrait()) {
             // Portrait
-            batch.draw(joystickIcon, 20, 20);
-            batch.draw(fullScreenIcon, viewportManager.getWidth() - viewportManager.getWidth() / 2 - 48, 20);
+            batch.draw(fullScreenIcon, 20, 20);
+            batch.draw(joystickIcon, (viewportManager.getWidth() / 3) - 32, 20);
+            batch.draw(keyboardIcon, (viewportManager.getWidth() - (viewportManager.getWidth() / 3)) - 64, 20);
             batch.draw(backIcon, viewportManager.getWidth() - 116, 20);
         } else {
             // Landscape
diff --git a/core/src/main/java/com/agifans/agile/ui/GameScreenInputProcessor.java b/core/src/main/java/com/agifans/agile/ui/GameScreenInputProcessor.java
index 6a1d06f..38a6dcd 100644
--- a/core/src/main/java/com/agifans/agile/ui/GameScreenInputProcessor.java
+++ b/core/src/main/java/com/agifans/agile/ui/GameScreenInputProcessor.java
@@ -330,13 +330,17 @@ public boolean touchUp(int screenX, int screenY, int pointer, int button) {
             // Portrait.
             if (touchXY.y < 135) {
                 if (touchXY.x < 126) {
-                    joystickClicked = true;
+                    fullScreenClicked = true;
                 } else if (touchXY.x > (viewportManager.getWidth() - 126)) {
                     backArrowClicked = true;
                 } else {
-                    int midWidth = (int) (viewportManager.getWidth() - (viewportManager.getWidth() / 2));
-                    if ((touchXY.x > (midWidth - 63)) && (touchXY.x < (midWidth + 63))) {
-                        fullScreenClicked = true;
+                    float thirdPos = (viewportManager.getWidth() / 3);
+                    float twoThirdPos = (viewportManager.getWidth() - (viewportManager.getWidth() / 3));
+                    if ((touchXY.x > (thirdPos - 42)) && (touchXY.x < (thirdPos + 84))) {
+                        joystickClicked = true;
+                    }
+                    else if ((touchXY.x > (twoThirdPos - 84)) && (touchXY.x < (twoThirdPos + 42))) {
+                        keyboardClicked = true;
                     }
                 }
             }