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

Merge pull request #697 from kevlahnota/master

Browse Source 
update fix
This commit is contained in:
Anthony Calosa
2022-06-14 16:30:02 +08:00
committed by GitHub
parent 09b51f6880 3ce1b2858c
commit b75a193e41
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
View File

@@ -72,6 +72,16 @@ public class RewardScene extends UIScene {
exitCountDown = 0.0f; exitCountDown = 0.0f;
doneClicked = true; doneClicked = true;
} else { } else {
for (Actor actor : new Array.ArrayIterator<>(generated)) {
if (!(actor instanceof RewardActor)) {
continue;
}
RewardActor reward = (RewardActor) actor;
reward.clearHoldToolTip();
try {
stage.getActors().removeValue(reward, true);
} catch (Exception e) {}
}
Forge.switchToLast(); Forge.switchToLast();
} }
} else { } else {
@@ -117,7 +127,6 @@ public class RewardScene extends UIScene {
public void loadRewards(Array<Reward> newRewards, Type type, ShopActor shopActor) { public void loadRewards(Array<Reward> newRewards, Type type, ShopActor shopActor) {
RewardActor.clearHoldToolTip();
this.type = type; this.type = type;
doneClicked = false; doneClicked = false;

6
forge-gui-mobile/src/forge/adventure/util/RewardActor.java
View File

@@ -44,7 +44,7 @@ import static forge.adventure.util.Paths.ITEMS_ATLAS;
*/ */
public class RewardActor extends Actor implements Disposable, ImageFetcher.Callback { public class RewardActor extends Actor implements Disposable, ImageFetcher.Callback {
Tooltip<Image> tooltip; Tooltip<Image> tooltip;
static HoldTooltip holdTooltip; HoldTooltip holdTooltip;
Reward reward; Reward reward;
ShaderProgram shaderGrayscale = Forge.getGraphics().getShaderGrayscale(); ShaderProgram shaderGrayscale = Forge.getGraphics().getShaderGrayscale();
@@ -59,7 +59,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
boolean clicked = false; boolean clicked = false;
boolean sold = false; boolean sold = false;
boolean flipOnClick; boolean flipOnClick;
private static boolean hover; private boolean hover;
public static int renderedCount = 0; //Counter for cards that require rendering a preview. public static int renderedCount = 0; //Counter for cards that require rendering a preview.
static final ImageFetcher fetcher = GuiBase.getInterface().getImageFetcher(); static final ImageFetcher fetcher = GuiBase.getInterface().getImageFetcher();
@@ -267,7 +267,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
public boolean isFlipped() { public boolean isFlipped() {
return (clicked && flipProcess >= 1); return (clicked && flipProcess >= 1);
} }
public static void clearHoldToolTip() { public void clearHoldToolTip() {
if (holdTooltip != null) { if (holdTooltip != null) {
try { try {
hover = false; hover = false;