From f7001a17f2a1c60c34a72ea9d95ced50481013fe Mon Sep 17 00:00:00 2001 From: myk Date: Wed, 6 Feb 2013 19:41:48 +0000 Subject: [PATCH] differentiate item hilight when a FList listbox has lost focus from when the listbox is selected ensure the CardListViewer always appears in the center of the screen --- src/main/java/forge/gui/CardListViewer.java | 1 + src/main/java/forge/gui/toolbox/FList.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/forge/gui/CardListViewer.java b/src/main/java/forge/gui/CardListViewer.java index e3710eb143a..ca2a14afe12 100644 --- a/src/main/java/forge/gui/CardListViewer.java +++ b/src/main/java/forge/gui/CardListViewer.java @@ -141,6 +141,7 @@ public class CardListViewer { this.dialog = this.optionPane.createDialog(this.optionPane.getParent(), this.title); this.dialog.setSize(720, 360); this.dialog.addWindowFocusListener(new CardListFocuser()); + this.dialog.setLocationRelativeTo(null); this.dialog.setVisible(true); this.dialog.toFront(); diff --git a/src/main/java/forge/gui/toolbox/FList.java b/src/main/java/forge/gui/toolbox/FList.java index 71bd6237650..53857924233 100644 --- a/src/main/java/forge/gui/toolbox/FList.java +++ b/src/main/java/forge/gui/toolbox/FList.java @@ -70,7 +70,7 @@ public class FList extends JList { lst0, val0, i0, isSelected, cellHasFocus); lblItem.setBorder(new EmptyBorder(4, 3, 4, 3)); - lblItem.setBackground(FSkin.getColor(FSkin.Colors.CLR_ACTIVE)); + lblItem.setBackground(FSkin.getColor(cellHasFocus ? FSkin.Colors.CLR_ACTIVE : FSkin.Colors.CLR_INACTIVE)); lblItem.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT)); lblItem.setFont(FSkin.getFont(13)); lblItem.setOpaque(isSelected);