From 559e609b817930820dea56f3f32fbc875d87eb6f Mon Sep 17 00:00:00 2001
From: yugecin <yugecin@users.noreply.github.com>
Date: Sun, 28 Oct 2018 17:19:11 +0100
Subject: [PATCH] fix song menu footer buttons misalignment

---
 src/itdelatrisu/opsu/states/SongMenu.java | 6 +++---
 src/itdelatrisu/opsu/ui/MenuButton.java   | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java
index 70bf2129..29805417 100644
--- a/src/itdelatrisu/opsu/states/SongMenu.java
+++ b/src/itdelatrisu/opsu/states/SongMenu.java
@@ -37,6 +37,7 @@ import itdelatrisu.opsu.beatmap.BeatmapWatchService.BeatmapWatchServiceListener;
 import itdelatrisu.opsu.beatmap.LRUCache;
 import itdelatrisu.opsu.db.BeatmapDB;
 import itdelatrisu.opsu.db.ScoreDB;
+import itdelatrisu.opsu.objects.curves.Vec2f;
 import itdelatrisu.opsu.states.ButtonMenu.MenuState;
 import itdelatrisu.opsu.ui.Colors;
 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.AnimationEquation;
 
-import java.awt.Point;
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.StandardWatchEventKinds;
@@ -405,7 +405,7 @@ public class SongMenu extends ComplexOpsuState {
 		// selection buttons
 		// TODO: the origin should be bottomleft or something
 		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);
 		selectX += footerHeight + 2;
 		selectModsButton = new MenuButton(SELECTION_MODS_OVERLAY, selectX, footerY);
@@ -614,7 +614,7 @@ public class SongMenu extends ComplexOpsuState {
 		}
 
 		// selection buttons
-		Point c;
+		Vec2f c;
 		c = selectModeButton.bottomLeft();
 		SELECTION_MODE.getImage().draw(c.x, c.y - SELECTION_MODE.getHeight());
 		selectModeButton.draw();
diff --git a/src/itdelatrisu/opsu/ui/MenuButton.java b/src/itdelatrisu/opsu/ui/MenuButton.java
index bc26188c..3ad31a95 100644
--- a/src/itdelatrisu/opsu/ui/MenuButton.java
+++ b/src/itdelatrisu/opsu/ui/MenuButton.java
@@ -20,11 +20,10 @@ package itdelatrisu.opsu.ui;
 
 import itdelatrisu.opsu.GameImage;
 import itdelatrisu.opsu.Utils;
+import itdelatrisu.opsu.objects.curves.Vec2f;
 import itdelatrisu.opsu.ui.animations.AnimatedValue;
 import itdelatrisu.opsu.ui.animations.AnimationEquation;
 
-import java.awt.Point;
-
 import org.newdawn.slick.Animation;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Font;
@@ -177,8 +176,8 @@ public class MenuButton {
 	 */
 	public float getY() { return y; }
 	
-	public Point bottomLeft() {
-		return new Point((int) (x - xRadius), (int) (y + yRadius));
+	public Vec2f bottomLeft() {
+		return new Vec2f(x - xRadius, y + yRadius);
 	}
 
 	/**