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

fix scrollbar and max scroll position

Browse Source
This commit is contained in:
yugecin 2016-12-11 02:29:48 +01:00
parent 4a79ad8a25
commit 82269bf2bb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ public class OptionsOverlay {
tabY += GameImage.MENU_TAB.getImage().getHeight() / 2f; tabY += GameImage.MENU_TAB.getImage().getHeight() / 2f;
} }
} }
this.maxScrollOffset = maxScrollOffset; this.maxScrollOffset = maxScrollOffset - optionStartY - optionHeight;
// calculate other positions // calculate other positions
optionStartY = (int) (tabY + tabImage.getHeight() / 2 + 2); // +2 for the separator line optionStartY = (int) (tabY + tabImage.getHeight() / 2 + 2); // +2 for the separator line
@ -154,7 +154,7 @@ public class OptionsOverlay {
} }
// scrollbar // scrollbar
g.setColor(Color.white); g.setColor(Color.white);
g.fillRoundRect(optionStartX + optionWidth + 15, optionStartY + ((float) scrollOffset / maxScrollOffset) * (height - optionStartY), 10, 45, 2); g.fillRoundRect(optionStartX + optionWidth + 15, optionStartY + ((float) scrollOffset / (maxScrollOffset)) * (height - optionStartY - 45), 10, 45, 2);
g.clearClip(); g.clearClip();
} }
@ -270,7 +270,7 @@ public class OptionsOverlay {
} }
public void mouseDragged(int oldx, int oldy, int newx, int newy) { public void mouseDragged(int oldx, int oldy, int newx, int newy) {
scrollOffset += oldy - newy; scrollOffset = Utils.clamp(scrollOffset + oldy - newy, 0, maxScrollOffset);
} }
public void mouseWheelMoved(int delta) { public void mouseWheelMoved(int delta) {