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

- reshow selected card when the listbox regains focus

Browse Source 
- show current card /after/ the events stop firing so the card data doesn't get overwritten
This commit is contained in:
myk
2013-02-07 01:41:48 +00:00
parent f552ffbed6
commit f89efa6ae4
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/forge/gui/DualListBox.java
View File

@@ -6,6 +6,8 @@ import java.awt.Dimension;
import java.awt.GridLayout; import java.awt.GridLayout;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.KeyAdapter; import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent; import java.awt.event.KeyEvent;
import java.util.Arrays; import java.util.Arrays;
@@ -176,7 +178,7 @@ public class DualListBox<T> extends FPanel {
} }
private void showSelectedCard(Object obj) { private void showSelectedCard(Object obj) {
if (!showCard) { if (!showCard || null == obj) {
return; return;
} }
Card card = null; Card card = null;
@@ -199,7 +201,7 @@ public class DualListBox<T> extends FPanel {
list.getModel().addListDataListener(new ListDataListener() { list.getModel().addListDataListener(new ListDataListener() {
@Override @Override
public void intervalRemoved(ListDataEvent e) { public void intervalRemoved(ListDataEvent e) {
ListModel model = list.getModel(); final ListModel model = list.getModel();
if (0 == model.getSize()) { if (0 == model.getSize()) {
// nothing left to show // nothing left to show
return; return;
@@ -211,7 +213,6 @@ public class DualListBox<T> extends FPanel {
--cardIdxPre; --cardIdxPre;
} }
final int cardIdx = cardIdxPre; final int cardIdx = cardIdxPre;
showSelectedCard(model.getElementAt(cardIdx));
// invoke this later since the list is out of sync with the model // invoke this later since the list is out of sync with the model
// at this moment. // at this moment.
@@ -221,6 +222,7 @@ public class DualListBox<T> extends FPanel {
showCard = false; showCard = false;
list.setSelectedIndex(cardIdx); list.setSelectedIndex(cardIdx);
showCard = true; showCard = true;
showSelectedCard(model.getElementAt(cardIdx));
list.requestFocusInWindow(); list.requestFocusInWindow();
} }
}); });
@@ -256,7 +258,14 @@ public class DualListBox<T> extends FPanel {
list.addListSelectionListener(new ListSelectionListener() { list.addListSelectionListener(new ListSelectionListener() {
@Override @Override
public void valueChanged(final ListSelectionEvent ev) { public void valueChanged(ListSelectionEvent ev) {
showSelectedCard(list.getSelectedValue());
}
});
list.addFocusListener(new FocusAdapter() {
@Override
public void focusGained(FocusEvent e) {
showSelectedCard(list.getSelectedValue()); showSelectedCard(list.getSelectedValue());
} }
}); });