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

Fix bazaar not updating when changing quests

Browse Source
This commit is contained in:
Krazy
2017-06-13 04:34:06 +00:00
parent 37ab0d5650
commit 1fac1efba3
2 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
forge-gui-desktop/src/main/java/forge/GuiDesktop.java
View File

@@ -1,26 +1,6 @@
package forge;
import java.awt.Desktop;
import java.awt.Graphics2D;
import java.awt.Toolkit;
import java.awt.datatransfer.StringSelection;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.List;
import javax.swing.ImageIcon;
import javax.swing.JFileChooser;
import javax.swing.SwingUtilities;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
import forge.assets.FSkinProp;
import forge.assets.ISkinImage;
import forge.download.GuiDownloadService;
@@ -39,11 +19,7 @@ import forge.model.FModel;
import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.controllers.CEditorQuestCardShop;
import forge.screens.match.CMatchUI;
import forge.sound.AltSoundSystem;
import forge.sound.AudioClip;
import forge.sound.AudioMusic;
import forge.sound.IAudioClip;
import forge.sound.IAudioMusic;
import forge.sound.*;
import forge.toolbox.FOptionPane;
import forge.toolbox.FSkin;
import forge.toolbox.FSkin.SkinImage;
@@ -51,6 +27,19 @@ import forge.util.BuildInfo;
import forge.util.Callback;
import forge.util.FileUtil;
import forge.util.OperatingSystem;
import org.apache.commons.lang3.StringUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.datatransfer.StringSelection;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
import java.util.List;
public class GuiDesktop implements IGuiBase {
@Override
@@ -273,6 +262,7 @@ public class GuiDesktop implements IGuiBase {
@Override
public void showBazaar() {
Singletons.getControl().setCurrentScreen(FScreen.QUEST_BAZAAR);
FScreen.QUEST_BAZAAR.getController().update();
Singletons.getView().getFrame().validate();
}
@@ -303,4 +293,4 @@ public class GuiDesktop implements IGuiBase {
public void preventSystemSleep(boolean preventSleep) {
OperatingSystem.preventSystemSleep(preventSleep);
}
}
}

5
forge-gui-desktop/src/main/java/forge/screens/bazaar/CBazaarUI.java
View File

@@ -54,5 +54,10 @@ public enum CBazaarUI implements ICDoc {
*/
@Override
public void update() {
SwingUtilities.invokeLater(new Runnable() {
@Override public void run() {
view.getPnlSingleStall().updateStall();
}
});
}
}