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

*Made Vanguard tab panel conform (a little) better to skin theme.Unfortunately, due to *clenches fist* Swing some out of place code had to be added because you can't specify colors for certain parts of the JTabbedPane component in it's actual class because that would make too much sense.

Browse Source
This commit is contained in:
Hellfish
2012-11-30 07:12:44 +00:00
parent 7db8a40d11
commit 2ff2f4c9b3
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/control/FControl.java
View File

@@ -29,6 +29,7 @@ import java.util.List;
import javax.swing.ImageIcon;
import javax.swing.JLayeredPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.WindowConstants;
import forge.Singletons;
@@ -145,6 +146,12 @@ public enum FControl {
public void initialize() {
// Preloads skin components (using progress bar).
FSkin.loadFull();
//This must be done here or at least between the skin being loaded and any FTabbedPanes being created.
//Why,Swing? Why is this not a property of JTabbbedPane?
UIManager.put("TabbedPane.selected", FSkin.getColor(FSkin.Colors.CLR_ACTIVE));
UIManager.put("TabbedPane.contentOpaque", FSkin.getColor(FSkin.Colors.CLR_THEME));
UIManager.put("TabbedPane.unselectedBackground", FSkin.getColor(FSkin.Colors.CLR_THEME2));
// Does not use progress bar, due to be deprecated with battlefield refactoring.
CardFaceSymbols.loadImages();

16
src/main/java/forge/gui/home/variant/VSubmenuVanguard.java
View File

@@ -2,34 +2,21 @@ package forge.gui.home.variant;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Vector;
import javax.swing.AbstractButton;
import javax.swing.ButtonGroup;
import javax.swing.ButtonModel;
import javax.swing.JButton;
import javax.swing.JCheckBox;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.ScrollPaneConstants;
import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import net.miginfocom.swing.MigLayout;
import forge.card.CardCoreType;
import forge.card.CardRules;
import forge.card.CardRulesPredicates;
import forge.game.player.PlayerType;
import forge.gui.framework.DragCell;
import forge.gui.framework.DragTab;
@@ -47,6 +34,7 @@ import forge.gui.toolbox.FPanel;
import forge.gui.toolbox.FRadioButton;
import forge.gui.toolbox.FScrollPane;
import forge.gui.toolbox.FSkin;
import forge.gui.toolbox.FTabbedPane;
import forge.item.CardDb;
import forge.item.CardPrinted;
@@ -80,7 +68,7 @@ public enum VSubmenuVanguard implements IVSubmenu<CSubmenuVanguard> {
//////////////////////////////
private final JTabbedPane tabPane = new JTabbedPane();
private final FTabbedPane tabPane = new FTabbedPane();
private final List<FPanel> playerPanels = new ArrayList<FPanel>();
private final List<FDeckChooser> deckChoosers = new ArrayList<FDeckChooser>();
private final List<FList> avatarLists = new ArrayList<FList>();

15
src/main/java/forge/gui/toolbox/FTabbedPane.java Normal file
View File

@@ -0,0 +1,15 @@
package forge.gui.toolbox;
import javax.swing.JTabbedPane;
/**
* TODO: Write javadoc for this type.
*
*/
public class FTabbedPane extends JTabbedPane {
public FTabbedPane() {
this.setBackground(FSkin.getColor(FSkin.Colors.CLR_THEME));
this.setForeground(FSkin.getColor(FSkin.Colors.CLR_TEXT));
}
}