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

- Support showing plane description in Planar Conquest mode when choosing the current plane by tapping on the plane art (if the Desc: entry in planes.txt is non-empty).

Browse Source
This commit is contained in:
Agetian
2017-05-23 16:33:18 +00:00
parent 4993609791
commit ba898ecd32
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java
View File

@@ -22,6 +22,7 @@ import forge.planarconquest.ConquestPlane;
import forge.toolbox.FDisplayObject; import forge.toolbox.FDisplayObject;
import forge.toolbox.FOptionPane; import forge.toolbox.FOptionPane;
import forge.toolbox.FTimer; import forge.toolbox.FTimer;
import forge.toolbox.GuiDialog;
import forge.util.Utils; import forge.util.Utils;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
@@ -53,7 +54,7 @@ public class ConquestPlaneSelector extends FDisplayObject {
private int selectedIndex, artIndex; private int selectedIndex, artIndex;
private int currentPlaneIndex = -1; private int currentPlaneIndex = -1;
private FImage currentArt; private FImage currentArt;
private Rectangle leftArrowBounds, rightArrowBounds; private Rectangle leftArrowBounds, rightArrowBounds, currentArtBounds;
public ConquestPlaneSelector() { public ConquestPlaneSelector() {
reset(); reset();
@@ -126,6 +127,14 @@ public class ConquestPlaneSelector extends FDisplayObject {
incrementSelectedIndex(1); incrementSelectedIndex(1);
return true; return true;
} }
if (currentArtBounds != null && currentArtBounds.contains(x, y)) {
ConquestPlane plane = getSelectedPlane();
String desc = plane.getDescription();
if (!desc.isEmpty()) {
GuiDialog.message(plane.getDescription().replace("\\n", "'\n"), plane.getName());
return true;
}
}
return false; return false;
} }
@@ -171,6 +180,8 @@ public class ConquestPlaneSelector extends FDisplayObject {
g.startClip(x, y, artWidth, artHeight); g.startClip(x, y, artWidth, artHeight);
g.drawImage(currentArt, x + (monitorWidth - fullArtWidth) / 2, y, fullArtWidth, artHeight); g.drawImage(currentArt, x + (monitorWidth - fullArtWidth) / 2, y, fullArtWidth, artHeight);
g.endClip(); g.endClip();
currentArtBounds = new Rectangle(x, y, artWidth, artHeight);
} }
//draw monitor so plane art remains within it //draw monitor so plane art remains within it