external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix layout logic for trophy case

Browse Source
This commit is contained in:
drdev
2014-09-15 01:34:29 +00:00
parent 159f6d51cf
commit b989f59ac7
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-gui-mobile/src/forge/screens/settings/AchievementsPage.java
View File

@@ -18,7 +18,6 @@ import forge.util.Utils;
public class AchievementsPage extends TabPage<SettingsScreen> { public class AchievementsPage extends TabPage<SettingsScreen> {
private static final float PADDING = Utils.scaleMin(5); private static final float PADDING = Utils.scaleMin(5);
private static final int MIN_SHELVES = 3;
private static final int TROPHIES_PER_SHELVE = 4; private static final int TROPHIES_PER_SHELVE = 4;
private final FComboBox<AchievementCollection> cbCollections = add(new FComboBox<AchievementCollection>()); private final FComboBox<AchievementCollection> cbCollections = add(new FComboBox<AchievementCollection>());
@@ -55,9 +54,6 @@ public class AchievementsPage extends TabPage<SettingsScreen> {
trophyCase.achievements = achievements0; trophyCase.achievements = achievements0;
trophyCase.shelfCount = achievements0.getCount() % TROPHIES_PER_SHELVE; trophyCase.shelfCount = achievements0.getCount() % TROPHIES_PER_SHELVE;
if (trophyCase.shelfCount < MIN_SHELVES) {
trophyCase.shelfCount = MIN_SHELVES;
}
trophyCase.revalidate(); trophyCase.revalidate();
} }
@@ -72,8 +68,14 @@ public class AchievementsPage extends TabPage<SettingsScreen> {
@Override @Override
protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) { protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) {
float scrollWidth = visibleWidth;
return new ScrollBounds(visibleWidth * 1.6f, visibleHeight * 1.6f); float scale = scrollWidth / FSkinTexture.BG_TROPHY_CASE_TOP.getWidth();
float scrollHeight = (FSkinTexture.BG_TROPHY_CASE_TOP.getHeight() +
shelfCount * FSkinTexture.BG_TROPHY_CASE_SHELF.getHeight()) * scale;
while (scrollHeight < visibleHeight) {
scrollHeight += FSkinTexture.BG_TROPHY_CASE_SHELF.getHeight() * scale;
}
return new ScrollBounds(scrollWidth, scrollHeight);
} }
@Override @Override
@@ -101,7 +103,7 @@ public class AchievementsPage extends TabPage<SettingsScreen> {
} }
y += topHeight; y += topHeight;
for (int i = 0; i < shelfCount; i++) { while (true) {
if (y + shelfHeight > 0) { if (y + shelfHeight > 0) {
g.drawImage(FSkinTexture.BG_TROPHY_CASE_SHELF, x, y, w, shelfHeight); g.drawImage(FSkinTexture.BG_TROPHY_CASE_SHELF, x, y, w, shelfHeight);
} }
@@ -141,11 +143,11 @@ public class AchievementsPage extends TabPage<SettingsScreen> {
} }
g.drawImage(FSkinImage.TROPHY_PLATE, x + plateOffset, plateY, plateWidth, plateHeight); g.drawImage(FSkinImage.TROPHY_PLATE, x + plateOffset, plateY, plateWidth, plateHeight);
g.drawText(achievement.getDisplayName(), FONT, FORE_COLOR, x + plateOffset + plateWidth * 0.05f, plateY + plateHeight * 0.05f, plateWidth * 0.9f, plateHeight * 0.55f, false, HAlignment.CENTER, true); g.drawText(achievement.getDisplayName(), FONT, FORE_COLOR, x + plateOffset + plateWidth * 0.075f, plateY + plateHeight * 0.05f, plateWidth * 0.85f, plateHeight * 0.55f, false, HAlignment.CENTER, true);
String subTitle = achievement.getSubTitle(); String subTitle = achievement.getSubTitle();
if (subTitle != null) { if (subTitle != null) {
g.drawText(subTitle, SUB_FONT, FORE_COLOR, x + plateOffset + plateWidth * 0.05f, plateY + plateHeight * 0.6f, plateWidth * 0.9f, plateHeight * 0.35f, false, HAlignment.CENTER, true); g.drawText(subTitle, SUB_FONT, FORE_COLOR, x + plateOffset + plateWidth * 0.075f, plateY + plateHeight * 0.6f, plateWidth * 0.85f, plateHeight * 0.35f, false, HAlignment.CENTER, true);
} }
} }