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

fix song menu footer buttons misalignment

Browse Source
This commit is contained in:
yugecin 2018-10-28 17:19:11 +01:00
parent 28f5cfe5c8
commit 559e609b81
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/itdelatrisu/opsu/states/SongMenu.java
View File

@ -37,6 +37,7 @@ import itdelatrisu.opsu.beatmap.BeatmapWatchService.BeatmapWatchServiceListener;
import itdelatrisu.opsu.beatmap.LRUCache; import itdelatrisu.opsu.beatmap.LRUCache;
import itdelatrisu.opsu.db.BeatmapDB; import itdelatrisu.opsu.db.BeatmapDB;
import itdelatrisu.opsu.db.ScoreDB; import itdelatrisu.opsu.db.ScoreDB;
import itdelatrisu.opsu.objects.curves.Vec2f;
import itdelatrisu.opsu.states.ButtonMenu.MenuState; import itdelatrisu.opsu.states.ButtonMenu.MenuState;
import itdelatrisu.opsu.ui.Colors; import itdelatrisu.opsu.ui.Colors;
import itdelatrisu.opsu.ui.DropdownMenu; import itdelatrisu.opsu.ui.DropdownMenu;
@ -48,7 +49,6 @@ import itdelatrisu.opsu.ui.UI;
import itdelatrisu.opsu.ui.animations.AnimatedValue; import itdelatrisu.opsu.ui.animations.AnimatedValue;
import itdelatrisu.opsu.ui.animations.AnimationEquation; import itdelatrisu.opsu.ui.animations.AnimationEquation;
import java.awt.Point;
import java.io.File; import java.io.File;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.StandardWatchEventKinds; import java.nio.file.StandardWatchEventKinds;
@ -405,7 +405,7 @@ public class SongMenu extends ComplexOpsuState {
// selection buttons // selection buttons
// TODO: the origin should be bottomleft or something // TODO: the origin should be bottomleft or something
float selectX = width * (isWidescreen ? 0.164f : 0.1875f); float selectX = width * (isWidescreen ? 0.164f : 0.1875f);
final float footerButtonWidth = footerHeight * 0.84f; final float footerButtonWidth = footerHeight * 0.85f;
selectModeButton = new MenuButton(SELECTION_MODE_OVERLAY, selectX, footerY); selectModeButton = new MenuButton(SELECTION_MODE_OVERLAY, selectX, footerY);
selectX += footerHeight + 2; selectX += footerHeight + 2;
selectModsButton = new MenuButton(SELECTION_MODS_OVERLAY, selectX, footerY); selectModsButton = new MenuButton(SELECTION_MODS_OVERLAY, selectX, footerY);
@ -614,7 +614,7 @@ public class SongMenu extends ComplexOpsuState {
} }
// selection buttons // selection buttons
Point c; Vec2f c;
c = selectModeButton.bottomLeft(); c = selectModeButton.bottomLeft();
SELECTION_MODE.getImage().draw(c.x, c.y - SELECTION_MODE.getHeight()); SELECTION_MODE.getImage().draw(c.x, c.y - SELECTION_MODE.getHeight());
selectModeButton.draw(); selectModeButton.draw();

7
src/itdelatrisu/opsu/ui/MenuButton.java
View File

@ -20,11 +20,10 @@ package itdelatrisu.opsu.ui;
import itdelatrisu.opsu.GameImage; import itdelatrisu.opsu.GameImage;
import itdelatrisu.opsu.Utils; import itdelatrisu.opsu.Utils;
import itdelatrisu.opsu.objects.curves.Vec2f;
import itdelatrisu.opsu.ui.animations.AnimatedValue; import itdelatrisu.opsu.ui.animations.AnimatedValue;
import itdelatrisu.opsu.ui.animations.AnimationEquation; import itdelatrisu.opsu.ui.animations.AnimationEquation;
import java.awt.Point;
import org.newdawn.slick.Animation; import org.newdawn.slick.Animation;
import org.newdawn.slick.Color; import org.newdawn.slick.Color;
import org.newdawn.slick.Font; import org.newdawn.slick.Font;
@ -177,8 +176,8 @@ public class MenuButton {
*/ */
public float getY() { return y; } public float getY() { return y; }
public Point bottomLeft() { public Vec2f bottomLeft() {
return new Point((int) (x - xRadius), (int) (y + yRadius)); return new Vec2f(x - xRadius, y + yRadius);
} }
/** /**