Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Dark98
2006Scape Mobile
Commits
feb2eff4
Commit
feb2eff4
authored
4 years ago
by
khanhduytran0
Browse files
Options
Download
Email Patches
Plain Diff
Fix y inveryed
parent
d218a04b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+10
-6
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
app/src/main/java/org/lwjgl/glfw/CallbackBridge.java
+2
-2
app/src/main/java/org/lwjgl/glfw/CallbackBridge.java
with
12 additions
and
8 deletions
+12
-8
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
+
10
-
6
View file @
feb2eff4
...
...
@@ -416,8 +416,10 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
if
(
hudKeyHandled
!=
-
1
)
{
sendKeyPress
(
hudKeyHandled
);
}
else
{
CallbackBridge
.
sendCursorPos
(
x
,
y
);
CallbackBridge
.
sendMouseKeycode
(
rightOverride
?
LWJGLGLFWKeycode
.
GLFW_MOUSE_BUTTON_RIGHT
:
LWJGLGLFWKeycode
.
GLFW_MOUSE_BUTTON_LEFT
);
CallbackBridge
.
sendMouseEvent
(
x
,
CallbackBridge
.
windowHeight
-
y
,
rightOverride
?
LWJGLGLFWKeycode
.
GLFW_MOUSE_BUTTON_RIGHT
:
LWJGLGLFWKeycode
.
GLFW_MOUSE_BUTTON_LEFT
);
if
(!
rightOverride
)
{
CallbackBridge
.
mouseLeft
=
true
;
}
...
...
@@ -434,10 +436,12 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
theHandler
.
sendEmptyMessageDelayed
(
MainActivity
.
MSG_DROP_ITEM_BUTTON_CHECK
,
LauncherPreferences
.
PREF_LONGPRESS_TRIGGER
);
}
else
{
CallbackBridge
.
sendCursorPos
(
x
,
y
);
CallbackBridge
.
sendCursorPos
(
x
,
CallbackBridge
.
windowHeight
-
y
);
/*
if (!rightOverride) {
//
CallbackBridge.mouseLeft = true;
CallbackBridge.mouseLeft = true;
}
*/
if
(
CallbackBridge
.
isGrabbing
())
{
CallbackBridge
.
sendMouseKeycode
(
rightOverride
?
LWJGLGLFWKeycode
.
GLFW_MOUSE_BUTTON_RIGHT
:
LWJGLGLFWKeycode
.
GLFW_MOUSE_BUTTON_LEFT
,
true
);
...
...
@@ -451,7 +455,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
case
MotionEvent
.
ACTION_CANCEL
:
// 3
case
MotionEvent
.
ACTION_POINTER_UP
:
// 6
if
(!
isTouchInHotbar
)
{
CallbackBridge
.
sendCursorPos
(
x
,
y
);
CallbackBridge
.
sendCursorPos
(
x
,
CallbackBridge
.
windowHeight
-
y
);
// TODO uncomment after fix wrong trigger
// CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 0, x, y, 0, System.nanoTime());
...
...
@@ -484,7 +488,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
default
:
if
(!
isTouchInHotbar
)
{
CallbackBridge
.
sendCursorPos
(
x
,
y
);
CallbackBridge
.
sendCursorPos
(
x
,
CallbackBridge
.
windowHeight
-
y
);
}
break
;
}
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/org/lwjgl/glfw/CallbackBridge.java
+
2
-
2
View file @
feb2eff4
...
...
@@ -12,7 +12,7 @@ public class CallbackBridge {
public
static
final
int
ANDROID_TYPE_GRAB_STATE
=
0
;
public
static
int
windowWidth
,
windowHeight
;
public
static
volatile
int
windowWidth
,
windowHeight
;
public
static
int
mouseX
,
mouseY
;
public
static
boolean
mouseLeft
;
public
static
StringBuilder
DEBUG_STRING
=
new
StringBuilder
();
...
...
@@ -32,7 +32,7 @@ public class CallbackBridge {
public
static
void
sendCursorPos
(
int
x
,
int
y
)
{
DEBUG_STRING
.
append
(
"CursorPos="
+
x
+
", "
+
y
+
"\n"
);
mouseX
=
x
;
mouseY
=
windowHeight
-
y
;
mouseY
=
y
;
sendData
(
JRE_TYPE_CURSOR_POS
,
x
+
":"
+
y
);
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment