From 9927123cb32b7e67f9bf7b3b93e06b6f9107df74 Mon Sep 17 00:00:00 2001 From: Mark Langen Date: Thu, 15 Sep 2016 00:55:23 -0600 Subject: [PATCH] Made deck area orientation dynamic. * Deck area orientation now changes depending on the context. * In free building and sideboarding, the sideboard and maindeck are shown side by side. * In limited deckbuilding, the sideboard (with your limited pool) is shown above the maindeck. --- .../src/main/java/mage/client/deckeditor/DeckArea.java | 10 ++++++++++ .../java/mage/client/deckeditor/DeckEditorPanel.java | 3 +++ 2 files changed, 13 insertions(+) diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java index d7a2dd1b02f..c9786aed8ff 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java @@ -41,6 +41,8 @@ import mage.client.util.GUISizeHelper; import mage.client.util.Listener; import mage.view.CardsView; +import javax.swing.*; + /** * * @author BetaSteward_at_googlemail.com @@ -76,6 +78,14 @@ public class DeckArea extends javax.swing.JPanel { private void setGUISize() { } + public void setOrientation(boolean limitedBuildingOrientation) { + if (limitedBuildingOrientation) { + deckAreaSplitPane.setOrientation(JSplitPane.VERTICAL_SPLIT); + } else { + deckAreaSplitPane.setOrientation(JSplitPane.HORIZONTAL_SPLIT); + } + } + public void showSideboard(boolean show) { this.sideboardList.setVisible(show); } diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java index 445986a626d..e7ba99792f7 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java @@ -154,6 +154,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { switch (mode) { case LIMITED_BUILDING: + this.deckArea.setOrientation(/*limitedBuildingOrientation = */true); this.btnAddLand.setVisible(true); this.txtTimeRemaining.setVisible(true); case SIDEBOARDING: @@ -162,6 +163,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { this.cardSelector.loadSideboard(new ArrayList<>(deck.getSideboard()), this.bigCard); } // TODO: take from preferences + this.deckArea.setOrientation(/*limitedBuildingOrientation = */false); this.cardSelector.switchToGrid(); this.btnExit.setVisible(false); this.btnImport.setVisible(false); @@ -182,6 +184,7 @@ public class DeckEditorPanel extends javax.swing.JPanel { } break; case FREE_BUILDING: + this.deckArea.setOrientation(/*limitedBuildingOrientation = */false); this.btnSubmit.setVisible(false); this.btnAddLand.setVisible(true); this.cardSelector.loadCards(this.bigCard);