eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Ben Fry
2015-05-19 17:56:09 -04:00
parent 77e2bfb6ef 723cc642be
commit 0fa42f646a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PSurfaceJOGL.java
+7 -2
View File
@@ -750,6 +750,9 @@ public class PSurfaceJOGL implements PSurface {
window.getCurrentSurfaceScale(currentPixelScale);
int sx = (int)(nativeEvent.getX()/currentPixelScale[0]);
int sy = (int)(nativeEvent.getY()/currentPixelScale[1]);
int mx = sx - (int)offsetX;
int my = sy - (int)offsetY;
if (presentMode) {
if (peAction == KeyEvent.RELEASE &&
20 < sx && sx < 20 + 100 &&
@@ -763,10 +766,12 @@ public class PSurfaceJOGL implements PSurface {
sketch.exit();
// window.destroy();
}
if (mx < 0 || sketchWidth < mx || my < 0 || sketchHeight < my) {
return;
}
}
int mx = sx - (int)offsetX;
int my = sy - (int)offsetY;
// if (!graphics.is2X() && 1 < hasSurfacePixelScale[0]) {
// x /= 2;
// y /= 2;