From 1f4142e368924108017835772fe93e010daca36a Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Mon, 21 Jan 2019 17:58:35 -0500 Subject: [PATCH 1/2] remember old location and size of pop-up card list window --- .../src/main/java/forge/view/arcane/ListCardArea.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java index c73ee2fb66d..44a9cb1e124 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/ListCardArea.java @@ -85,7 +85,6 @@ public class ListCardArea extends FloatingCardArea { public ListCardArea(final CMatchUI matchUI, final String title0, final List cardList0, final List moveableCards0, final boolean toTop0, final boolean toBottom0, final boolean toAnywhere0) { super(matchUI); window.add(getScrollPane(),"grow, push"); - // try { Thread.sleep(1000); } catch(InterruptedException ex) { } getScrollPane().setViewportView(this); setOpaque(false); doneButton = new FButton("Done"); @@ -112,6 +111,7 @@ public class ListCardArea extends FloatingCardArea { protected final FDialog window = new FDialog(true, true, "0") { @Override public void setLocationRelativeTo(Component c) { + if (hasBeenShown || locLoaded) { return; } super.setLocationRelativeTo(c); } @Override @@ -124,10 +124,11 @@ public class ListCardArea extends FloatingCardArea { getWidth() + COORD_DELIM + getHeight()); //don't call prefs.save(), instead allowing them to be saved when match ends } - if (b0) { - storedArea.refresh(); - } super.setVisible(b0); + if (b0) { + refresh(); + hasBeenShown = true; + } } }; From 67ca319674719001a881349ff8f6c5292cdbca5f Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Mon, 21 Jan 2019 18:10:30 -0500 Subject: [PATCH 2/2] remove debugging print in manipulateCardList --- forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java | 1 - 1 file changed, 1 deletion(-) diff --git a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java index 15546d96175..8070f65d3fa 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java +++ b/forge-gui-desktop/src/main/java/forge/gui/GuiChoose.java @@ -287,7 +287,6 @@ public class GuiChoose { public static List manipulateCardList(final CMatchUI gui, final String title, final Iterable cards, final Iterable manipulable, final boolean toTop, final boolean toBottom, final boolean toAnywhere) { - System.out.print("MCL "); System.out.println(manipulable); gui.setSelectables(manipulable); final Callable> callable = new Callable>() { @Override