2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-19 21:10:11 -07:00
Code Issues Projects Releases Packages Wiki Activity

Clean up some code

Browse source
This commit is contained in:
SerpentSpirale 2021-05-23 12:27:21 +02:00 • committed by SerpentSpirale
parent 283634cba2
commit 7132a576bf
1 changed files with 17 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View file

@ -348,9 +348,7 @@ public class BaseMainActivity extends LoggableActivity {
sendKeyPress(hudKeyHandled);
} else {
CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, mouse_x, mouse_y);
if (!rightOverride) {
CallbackBridge.mouseLeft = true;
}
if (!rightOverride) CallbackBridge.mouseLeft = true;
}
} else {
switch (e.getActionMasked()) {
@ -364,23 +362,22 @@ public class BaseMainActivity extends LoggableActivity {
hotbarY = (int)e.getY();
theHandler.sendEmptyMessageDelayed(BaseMainActivity.MSG_DROP_ITEM_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
} else {
currentPointerID = e.getPointerId(0);
CallbackBridge.mouseX = mouse_x;
CallbackBridge.mouseY = mouse_y;
prevX = e.getX();
prevY = e.getY();
CallbackBridge.sendCursorPos(mouse_x, mouse_y);
if (!rightOverride) {
CallbackBridge.mouseLeft = true;
}
break;
}
if (CallbackBridge.isGrabbing()) {
// It cause hold left mouse while moving camera
initialX = mouse_x;
initialY = mouse_y;
theHandler.sendEmptyMessageDelayed(BaseMainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
}
currentPointerID = e.getPointerId(0);
CallbackBridge.mouseX = mouse_x;
CallbackBridge.mouseY = mouse_y;
prevX = e.getX();
prevY = e.getY();
CallbackBridge.sendCursorPos(mouse_x, mouse_y);
if (!rightOverride) CallbackBridge.mouseLeft = true;
if (CallbackBridge.isGrabbing()) {
// It cause hold left mouse while moving camera
initialX = mouse_x;
initialY = mouse_y;
theHandler.sendEmptyMessageDelayed(BaseMainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
}
break;
@ -392,9 +389,7 @@ public class BaseMainActivity extends LoggableActivity {
// -TODO uncomment after fix wrong trigger
CallbackBridge.sendCursorPos(mouse_x, mouse_y);
if (!rightOverride) {
CallbackBridge.mouseLeft = false;
}
if (!rightOverride) CallbackBridge.mouseLeft = false;
}
if (CallbackBridge.isGrabbing()) {
@ -588,7 +583,6 @@ public class BaseMainActivity extends LoggableActivity {
}
@Override
public boolean dispatchGenericMotionEvent(MotionEvent ev) {
int mouseCursorIndex = -1;