EaZyCode/SoundDraw
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix out of bounds

Browse Source
This commit is contained in:
SuspiciousActivity committed 2022-09-13 22:07:15 +02:00
1 parent c6dd6c3a79
commit efca31dc79
1 file changed
+10 -11
Download Patch File Download Diff File Expand all files Collapse all files
src/me/SoundDraw/DrawingBoard.java
+10 -11
View File
@@ -219,13 +219,13 @@ public class DrawingBoard extends JPanel {
if (mouseDrag != EnumMouseDrag.MOVE) if (mouseDrag != EnumMouseDrag.MOVE)
return; return;
int width = getWidth(); float width = getWidth();
int newOff = (int) ((float) (lastPos.x - pos.x) / zoom / ((float) width / data.length)); int newOff = (int) ((float) (lastPos.x - pos.x) / zoom / (width / data.length));
int half = data.length / 2; float half = data.length / 2f;
int lowerBound = half / zoom - half - centerOff; int lowerBound = (int) Math.ceil(half / zoom - half - centerOff);
int higherBound = data.length - half / zoom - half - centerOff; int higherBound = (int) Math.floor(data.length - half / zoom - half - centerOff);
if (newOff < lowerBound) { if (newOff < lowerBound) {
newOff = lowerBound; newOff = lowerBound;
@@ -239,7 +239,7 @@ public class DrawingBoard extends JPanel {
} }
private void fireZoom(Point pos, int wheel) { private void fireZoom(Point pos, int wheel) {
int width = getWidth(); float width = getWidth();
int oldZoom = zoom; int oldZoom = zoom;
@@ -252,14 +252,13 @@ public class DrawingBoard extends JPanel {
if (oldZoom == zoom) if (oldZoom == zoom)
return; return;
int pseudoMoveOff = (int) ((float) (pos.x - width / 2) / oldZoom / zoom / ((float) width / data.length)); int pseudoMoveOff = (int) ((float) (pos.x - width / 2) / oldZoom / zoom / (width / data.length));
centerOff += wheel < 0 ? pseudoMoveOff : -pseudoMoveOff; centerOff += wheel < 0 ? pseudoMoveOff : -pseudoMoveOff;
int half = data.length / 2; float half = data.length / 2f;
int lowerBound = half / zoom - half - centerOff; int lowerBound = (int) Math.ceil(half / zoom - half - centerOff);
int higherBound = data.length - half / zoom - half - centerOff; int higherBound = (int) Math.floor(data.length - half / zoom - half - centerOff);
int newOff = 0;
if (lowerBound > 0) { if (lowerBound > 0) {
centerOff += lowerBound; centerOff += lowerBound;
} else if (higherBound < 0) { } else if (higherBound < 0) {