Commit 8ed1ad4a authored by Michael Kamensky's avatar Michael Kamensky

Merge branch 'master' into 'master'

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

See merge request core-developers/forge!1300
parents b8147a2e 67ca3196
......@@ -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,
final boolean toTop, final boolean toBottom, final boolean toAnywhere) {
System.out.print("MCL "); System.out.println(manipulable);
gui.setSelectables(manipulable);
final Callable<List<CardView>> callable = new Callable<List<CardView>>() {
@Override
......
......@@ -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) {
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
}
super.setVisible(b0);
if (b0) {
storedArea.refresh();
refresh();
hasBeenShown = true;
}
super.setVisible(b0);
}
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment