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

Fixed context menu in shop and deck editor

Browse Source
This commit is contained in:
Grimm
2021-12-08 03:17:07 +01:00
parent 54246b9d36
commit 0f4be415f5
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-adventure/src/main/java/forge/adventure/scene/AdventureDeckEditor.java
View File

@@ -25,10 +25,7 @@ import forge.model.FModel;
import forge.screens.FScreen; import forge.screens.FScreen;
import forge.screens.LoadingOverlay; import forge.screens.LoadingOverlay;
import forge.screens.TabPageScreen; import forge.screens.TabPageScreen;
import forge.toolbox.FContainer; import forge.toolbox.*;
import forge.toolbox.FEvent;
import forge.toolbox.FLabel;
import forge.toolbox.GuiChoose;
import forge.util.Callback; import forge.util.Callback;
import forge.util.ItemPool; import forge.util.ItemPool;
import forge.util.Localizer; import forge.util.Localizer;
@@ -45,7 +42,6 @@ import java.util.Map;
private static ItemPool<InventoryItem> decksUsingMyCards=new ItemPool<>(InventoryItem.class); private static ItemPool<InventoryItem> decksUsingMyCards=new ItemPool<>(InventoryItem.class);
@Override @Override
public void onActivate() { public void onActivate() {
decksUsingMyCards = new ItemPool<>(InventoryItem.class); decksUsingMyCards = new ItemPool<>(InventoryItem.class);

2
forge-adventure/src/main/java/forge/adventure/scene/DeckEditScene.java
View File

@@ -33,7 +33,7 @@ public class DeckEditScene extends ForgeScene {
} }
@Override @Override
public FScreen getScreen() { public FScreen getScreen() {
return screen==null?screen = new AdventureDeckEditor(true):screen; return screen==null?screen = new AdventureDeckEditor(false):screen;
} }
} }

1
forge-adventure/src/main/java/forge/adventure/scene/ForgeScene.java
View File

@@ -71,6 +71,7 @@ public abstract class ForgeScene extends Scene implements IUpdateable {
@Override @Override
public void enter() { public void enter() {
FOverlay.hideAll();
if(getScreen()!=null) if(getScreen()!=null)
getScreen().setSize(AdventureApplicationAdapter.instance.getCurrentWidth(), AdventureApplicationAdapter.instance.getCurrentHeight()); getScreen().setSize(AdventureApplicationAdapter.instance.getCurrentWidth(), AdventureApplicationAdapter.instance.getCurrentHeight());