mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-09 20:51:37 -04:00
fix(glsurface): avoid negative size
This commit is contained in:
parent
5b99165160
commit
b63255e4cf
@ -239,7 +239,7 @@ public class MinecraftGLSurface extends View implements GrabListener {
|
|||||||
CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
|
CallbackBridge.sendCursorPos(CallbackBridge.mouseX, CallbackBridge.mouseY);
|
||||||
return true;
|
return true;
|
||||||
case MotionEvent.ACTION_SCROLL:
|
case MotionEvent.ACTION_SCROLL:
|
||||||
CallbackBridge.sendScroll((double) event.getAxisValue(MotionEvent.AXIS_HSCROLL), (double) event.getAxisValue(MotionEvent.AXIS_VSCROLL));
|
CallbackBridge.sendScroll(event.getAxisValue(MotionEvent.AXIS_HSCROLL), event.getAxisValue(MotionEvent.AXIS_VSCROLL));
|
||||||
return true;
|
return true;
|
||||||
case MotionEvent.ACTION_BUTTON_PRESS:
|
case MotionEvent.ACTION_BUTTON_PRESS:
|
||||||
return sendMouseButtonUnconverted(event.getActionButton(),true);
|
return sendMouseButtonUnconverted(event.getActionButton(),true);
|
||||||
@ -338,8 +338,14 @@ public class MinecraftGLSurface extends View implements GrabListener {
|
|||||||
// Use the width and height of the View instead of display dimensions to avoid
|
// Use the width and height of the View instead of display dimensions to avoid
|
||||||
// getting squiched/stretched due to inconsistencies between the layout and
|
// getting squiched/stretched due to inconsistencies between the layout and
|
||||||
// screen dimensions.
|
// screen dimensions.
|
||||||
windowWidth = Tools.getDisplayFriendlyRes(getWidth(), LauncherPreferences.PREF_SCALE_FACTOR);
|
int newWidth = Tools.getDisplayFriendlyRes(getWidth(), LauncherPreferences.PREF_SCALE_FACTOR);
|
||||||
windowHeight = Tools.getDisplayFriendlyRes(getHeight(), LauncherPreferences.PREF_SCALE_FACTOR);
|
int newHeight = Tools.getDisplayFriendlyRes(getHeight(), LauncherPreferences.PREF_SCALE_FACTOR);
|
||||||
|
if (newHeight < 1 || newWidth < 1) {
|
||||||
|
Log.e("MGLSurface", String.format("Impossible resolution : %dx%d", newWidth, newHeight));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
windowWidth = newWidth;
|
||||||
|
windowHeight = newHeight;
|
||||||
if(mSurface == null){
|
if(mSurface == null){
|
||||||
Log.w("MGLSurface", "Attempt to refresh size on null surface");
|
Log.w("MGLSurface", "Attempt to refresh size on null surface");
|
||||||
return;
|
return;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user