From a52a1f58205bc48a5ce20f67ccd83c045615a615 Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 26 Jan 2014 18:54:10 +0000 Subject: [PATCH] Threw in an idea for playerPanels in constructed screen --- .../home/sanctioned/VSubmenuConstructed.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java index 1fc1c5154a8..c8a88408cd0 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/VSubmenuConstructed.java @@ -141,6 +141,7 @@ public enum VSubmenuConstructed implements IVSubmenu { private final List planarDeckPanels = new ArrayList(8); private final List plnDeckSelectorBtns = new ArrayList(8); private final List plnEditors = new ArrayList(8); + private final List lblPlanarDecks = new ArrayList<>(8); private final List> vgdAvatarLists = new ArrayList>(); private final List vgdPanels = new ArrayList(8); @@ -358,7 +359,7 @@ public enum VSubmenuConstructed implements IVSubmenu { } }); playerPanel.add(newLabel("Deck:"), "w 40px, h 30px"); - playerPanel.add(deckBtn, "pushx, growx, wmax 100%-157px, h 30px, spanx 4, wrap"); + playerPanel.add(deckBtn, "pushx, growx, wmax 100%-153px, h 30px, spanx 4, wrap"); deckSelectorBtns.add(deckBtn); // Variants @@ -393,8 +394,15 @@ public enum VSubmenuConstructed implements IVSubmenu { new CEditorVariant(Singletons.getModel().getDecks().getPlane(), predPlanes, DeckSection.Planes, FScreen.DECK_EDITOR_PLANECHASE)); } }); - playerPanel.add(plnDeckSelectorBtn, variantBtnConstraints + ", spanx, split 2, growx, pushx, gapright rel"); - playerPanel.add(plnDeckEditor, variantBtnConstraints + ", width 150px, wrap"); + + FLabel lblPlanarDeck = newLabel("Planar deck:"); + lblPlanarDeck.setVisible(appliedVariants.contains(GameType.Planechase)); + + playerPanel.add(lblPlanarDeck, variantBtnConstraints + ", cell 0 2, sx 2, ax right"); + playerPanel.add(plnDeckSelectorBtn, variantBtnConstraints + ", cell 2 2, growx, pushx"); + playerPanel.add(plnDeckEditor, variantBtnConstraints + ", cell 3 2, sx 3, growx, wrap"); + + lblPlanarDecks.add(lblPlanarDeck); plnDeckSelectorBtns.add(plnDeckSelectorBtn); plnEditors.add(plnDeckEditor); @@ -409,7 +417,7 @@ public enum VSubmenuConstructed implements IVSubmenu { changePlayerFocus(vgdSelectorBtns.indexOf(vgdSelectorBtn), GameType.Vanguard); } }); - playerPanel.add(vgdSelectorBtn, variantBtnConstraints + ", spanx, growx, pushx, wrap"); + playerPanel.add(vgdSelectorBtn, variantBtnConstraints + ", cell 2 3, sx 4, growx, wrap"); vgdSelectorBtns.add(vgdSelectorBtn); playerPanelList.add(playerPanel); @@ -806,6 +814,7 @@ public enum VSubmenuConstructed implements IVSubmenu { for (int i = 0; i < 8; i++) { plnDeckSelectorBtns.get(i).setVisible(true); plnEditors.get(i).setVisible(true); + lblPlanarDecks.get(i).setVisible(true); changePlayerFocus(playerWithFocus, variantType); } } else { @@ -813,6 +822,7 @@ public enum VSubmenuConstructed implements IVSubmenu { for (int i = 0; i < 8; i++) { plnDeckSelectorBtns.get(i).setVisible(false); plnEditors.get(i).setVisible(false); + lblPlanarDecks.get(i).setVisible(false); changePlayerFocus(playerWithFocus, GameType.Constructed); } }