Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow slight overscrolling in optionsmenu

Browse Source
This commit is contained in:
yugecin 2017-01-29 16:23:52 +01:00
parent ac398bf2ad
commit 82bbb4299d
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/itdelatrisu/opsu/ui/KineticScrolling.java
View File

@ -61,6 +61,12 @@ public class KineticScrolling {
/** The speed multiplier (divides {@link #TIME_CONST}). */ /** The speed multiplier (divides {@link #TIME_CONST}). */
private float speedMultiplier = 1f; private float speedMultiplier = 1f;
private boolean allowOverScroll;
public void setAllowOverScroll(boolean allowOverScroll) {
this.allowOverScroll = allowOverScroll;
}
/** /**
* Returns the current position. * Returns the current position.
* @return the position * @return the position
@ -94,13 +100,23 @@ public class KineticScrolling {
target = position; target = position;
deltaPosition = 0; deltaPosition = 0;
} }
if (position > max) { if (allowOverScroll && pressed) {
amplitude = 0; return;
target = position = max;
} }
if (position < min) { if (position > max) {
amplitude = 0; if (allowOverScroll) {
target = position = min; scrollToPosition(max);
} else {
amplitude = 0;
target = position = max;
}
} else if (position < min) {
if (allowOverScroll) {
scrollToPosition(min);
} else {
amplitude = 0;
target = position = min;
}
} }
} }

4
src/yugecin/opsudance/ui/OptionsOverlay.java
View File

@ -152,6 +152,7 @@ public class OptionsOverlay extends OverlayOpsuState {
listHoverIndex = -1; listHoverIndex = -1;
searchField = new TextField(displayContainer, null, 0, 0, 0, 0); searchField = new TextField(displayContainer, null, 0, 0, 0, 0);
scrollHandler = new KineticScrolling(); scrollHandler = new KineticScrolling();
scrollHandler.setAllowOverScroll(true);
} }
public void setListener(Listener listener) { public void setListener(Listener listener) {
@ -326,9 +327,6 @@ public class OptionsOverlay extends OverlayOpsuState {
maxScrollOffset = 0; maxScrollOffset = 0;
} }
scrollHandler.setMinMax(0f, maxScrollOffset); scrollHandler.setMinMax(0f, maxScrollOffset);
if (scrollHandler.getIntPosition() > maxScrollOffset) {
scrollHandler.setPosition(maxScrollOffset);
}
} }
private void renderOpenList(Graphics g) { private void renderOpenList(Graphics g) {