Added fade effects for tooltips.
Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
@@ -353,17 +353,13 @@ public class SongMenu extends BasicGameState {
|
||||
}
|
||||
|
||||
// score buttons
|
||||
ScoreData hoverScore = null;
|
||||
if (focusScores != null) {
|
||||
for (int i = 0; i < MAX_SCORE_BUTTONS; i++) {
|
||||
int rank = startScore + i;
|
||||
if (rank >= focusScores.length)
|
||||
break;
|
||||
long prevScore = (rank + 1 < focusScores.length) ? focusScores[rank + 1].score : -1;
|
||||
boolean contains = ScoreData.buttonContains(mouseX, mouseY, i);
|
||||
focusScores[rank].draw(g, i, rank, prevScore, contains);
|
||||
if (contains)
|
||||
hoverScore = focusScores[rank];
|
||||
focusScores[rank].draw(g, i, rank, prevScore, ScoreData.buttonContains(mouseX, mouseY, i));
|
||||
}
|
||||
|
||||
// scroll bar
|
||||
@@ -459,10 +455,6 @@ public class SongMenu extends BasicGameState {
|
||||
UI.getBackButton().draw();
|
||||
|
||||
UI.draw(g);
|
||||
|
||||
// tooltips
|
||||
if (hoverScore != null)
|
||||
hoverScore.drawTooltip(g);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -575,6 +567,20 @@ public class SongMenu extends BasicGameState {
|
||||
if (!isHover) {
|
||||
hoverOffset = 0f;
|
||||
hoverIndex = -1;
|
||||
} else
|
||||
return;
|
||||
|
||||
// tooltips
|
||||
if (focusScores != null) {
|
||||
for (int i = 0; i < MAX_SCORE_BUTTONS; i++) {
|
||||
int rank = startScore + i;
|
||||
if (rank >= focusScores.length)
|
||||
break;
|
||||
if (ScoreData.buttonContains(mouseX, mouseY, i)) {
|
||||
UI.updateTooltip(delta, focusScores[rank].getTooltipString(), true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user