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

let the parent draw UI, fix SBoverlay input events

Browse Source
This commit is contained in:
yugecin 2016-12-11 12:16:20 +01:00
parent da65270ab0
commit 03ef993a18
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/itdelatrisu/opsu/states/OptionsMenu.java
View File

@ -175,6 +175,7 @@ public class OptionsMenu extends BasicGameState implements OptionsOverlay.Parent
int mouseX = input.getMouseX(), mouseY = input.getMouseY(); int mouseX = input.getMouseX(), mouseY = input.getMouseY();
optionsOverlay.render(g, mouseX, mouseY); optionsOverlay.render(g, mouseX, mouseY);
UI.draw(g);
} }
@Override @Override

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

@ -136,7 +136,6 @@ public class OptionsOverlay {
// UI // UI
UI.getBackButton().draw(); UI.getBackButton().draw();
UI.draw(g);
// tooltip // tooltip
renderTooltip(g, mouseX, mouseY); renderTooltip(g, mouseX, mouseY);

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

@ -247,7 +247,7 @@ public class SBOverlay implements OptionsOverlay.Parent {
} }
public boolean mousePressed(int button, int x, int y) { public boolean mousePressed(int button, int x, int y) {
if (menu) { if (!menu) {
return false; return false;
} }
overlay.mousePressed(button, x, y); overlay.mousePressed(button, x, y);
@ -255,7 +255,7 @@ public class SBOverlay implements OptionsOverlay.Parent {
} }
public boolean mouseDragged(int oldx, int oldy, int newx, int newy) { public boolean mouseDragged(int oldx, int oldy, int newx, int newy) {
if (menu) { if (!menu) {
return false; return false;
} }
overlay.mouseDragged(oldx, oldy, newx, newy); overlay.mouseDragged(oldx, oldy, newx, newy);
@ -278,7 +278,7 @@ public class SBOverlay implements OptionsOverlay.Parent {
} }
public boolean mouseReleased(int button, int x, int y) { public boolean mouseReleased(int button, int x, int y) {
if (menu) { if (!menu) {
return false; return false;
} }
overlay.mouseReleased(button, x, y); overlay.mouseReleased(button, x, y);