From 876ae5c2852a21cdade85ec5d0c8abc861a690ab Mon Sep 17 00:00:00 2001
From: SerpentSpirale <serpentspirale@gmail.com>
Date: Fri, 18 Jun 2021 19:36:58 +0200
Subject: [PATCH] Optimized how many times we use handle GUI bar function.

---
 .../main/java/net/kdt/pojavlaunch/BaseMainActivity.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
index 997b3d982..f30791bb7 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
@@ -330,13 +330,14 @@ public class BaseMainActivity extends LoggableActivity {
 
                     // System.out.println("Pre touch, isTouchInHotbar=" + Boolean.toString(isTouchInHotbar) + ", action=" + MotionEvent.actionToString(e.getActionMasked()));
 
+                    //Getting scaled position from the event
                     if(!CallbackBridge.isGrabbing()) {
                         mouse_x = (int) (e.getX() * scaleFactor);
                         mouse_y = (int) (e.getY() * scaleFactor);
                     }
 
-                    int hudKeyHandled = handleGuiBar((int)e.getX(), (int)e.getY());
-                    if (!CallbackBridge.isGrabbing() && gestureDetector.onTouchEvent(e) && hudKeyHandled == -1){
+                    int hudKeyHandled;
+                    if (!CallbackBridge.isGrabbing() && gestureDetector.onTouchEvent(e)){
                         CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, mouse_x, mouse_y);
                         if (!rightOverride) CallbackBridge.mouseLeft = true;
                         return true;
@@ -352,8 +353,8 @@ public class BaseMainActivity extends LoggableActivity {
                             prevX =  e.getX();
                             prevY =  e.getY();
 
-                            //Compute the touchbar after
-                            // to avoid mouse jumps.
+
+                            hudKeyHandled = handleGuiBar((int)e.getX(), (int) e.getY());
                             isTouchInHotbar = hudKeyHandled != -1;
                             if (isTouchInHotbar) {
                                 sendKeyPress(hudKeyHandled);