Fix so second player's prompt appears and button images don't extend outside their bounds

This commit is contained in:
drdev
2014-09-23 11:52:50 +00:00
parent 6a5cd5f39f
commit 1d965da35e
2 changed files with 5 additions and 1 deletions

View File

@@ -173,7 +173,7 @@ public class MatchScreen extends FScreen {
@Override
protected void doLayout(float startY, float width, float height) {
if (topPlayerPrompt != null) {
bottomPlayerPrompt.setBounds(0, startY, width, VPrompt.HEIGHT);
topPlayerPrompt.setBounds(0, startY, width, VPrompt.HEIGHT);
startY += VPrompt.HEIGHT;
}
scroller.setBounds(0, startY, width, height - VPrompt.HEIGHT - startY);

View File

@@ -198,15 +198,19 @@ public class FButton extends FDisplayObject implements IButton {
w -= 2 * PADDING;
break;
case BottomLeft:
g.startClip(x, y, w, h);
g.drawImage(imgM, 0, 0, cornerButtonWidth, cornerButtonHeight);
g.drawImage(imgR, cornerButtonWidth, 0, cornerButtonWidth, cornerButtonHeight);
g.endClip();
w -= cornerTextOffsetX;
y += cornerTextOffsetY;
h -= cornerTextOffsetY;
break;
case BottomRight:
g.startClip(x, y, w, h);
g.drawImage(imgL, 0, 0, cornerButtonWidth, cornerButtonHeight);
g.drawImage(imgM, cornerButtonWidth, 0, cornerButtonWidth, cornerButtonHeight);
g.endClip();
x += cornerTextOffsetX;
w -= cornerTextOffsetX;
y += cornerTextOffsetY;