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

Merge branch 'master' into 'master'

Browse Source 
remember old location and size of pop-up card list window

See merge request core-developers/forge!1300
This commit is contained in:
Michael Kamensky
2019-01-22 04:18:38 +00:00
parent b8147a2e58 67ca319674
commit 8ed1ad4afc
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java
View File

@@ -287,7 +287,6 @@ public class GuiChoose {
public static List<CardView> manipulateCardList(final CMatchUI gui, final String title, final Iterable<CardView> cards, final Iterable<CardView> manipulable, public static List<CardView> manipulateCardList(final CMatchUI gui, final String title, final Iterable<CardView> cards, final Iterable<CardView> manipulable,
final boolean toTop, final boolean toBottom, final boolean toAnywhere) { final boolean toTop, final boolean toBottom, final boolean toAnywhere) {
System.out.print("MCL "); System.out.println(manipulable);
gui.setSelectables(manipulable); gui.setSelectables(manipulable);
final Callable<List<CardView>> callable = new Callable<List<CardView>>() { final Callable<List<CardView>> callable = new Callable<List<CardView>>() {
@Override @Override

9
forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java
View File

@@ -85,7 +85,6 @@ public class ListCardArea extends FloatingCardArea {
public ListCardArea(final CMatchUI matchUI, final String title0, final List<CardView> cardList0, final List<CardView> moveableCards0, final boolean toTop0, final boolean toBottom0, final boolean toAnywhere0) { public ListCardArea(final CMatchUI matchUI, final String title0, final List<CardView> cardList0, final List<CardView> moveableCards0, final boolean toTop0, final boolean toBottom0, final boolean toAnywhere0) {
super(matchUI); super(matchUI);
window.add(getScrollPane(),"grow, push"); window.add(getScrollPane(),"grow, push");
// try { Thread.sleep(1000); } catch(InterruptedException ex) { }
getScrollPane().setViewportView(this); getScrollPane().setViewportView(this);
setOpaque(false); setOpaque(false);
doneButton = new FButton("Done"); doneButton = new FButton("Done");
@@ -112,6 +111,7 @@ public class ListCardArea extends FloatingCardArea {
protected final FDialog window = new FDialog(true, true, "0") { protected final FDialog window = new FDialog(true, true, "0") {
@Override @Override
public void setLocationRelativeTo(Component c) { public void setLocationRelativeTo(Component c) {
if (hasBeenShown || locLoaded) { return; }
super.setLocationRelativeTo(c); super.setLocationRelativeTo(c);
} }
@Override @Override
@@ -124,10 +124,11 @@ public class ListCardArea extends FloatingCardArea {
getWidth() + COORD_DELIM + getHeight()); getWidth() + COORD_DELIM + getHeight());
//don't call prefs.save(), instead allowing them to be saved when match ends //don't call prefs.save(), instead allowing them to be saved when match ends
} }
if (b0) {
storedArea.refresh();
}
super.setVisible(b0); super.setVisible(b0);
if (b0) {
refresh();
hasBeenShown = true;
}
} }
}; };