From 084d14dfdd89a3be9014a4297a12f073e7e7efd3 Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 9 Dec 2011 03:36:55 +0000 Subject: [PATCH] - Minor adjustments to the layout of the quest mode deck editor. --- .../forge/gui/deckeditor/DeckEditorQuest.java | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java b/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java index bfc696e7d2c..312a0c4b92d 100644 --- a/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java +++ b/src/main/java/forge/gui/deckeditor/DeckEditorQuest.java @@ -214,11 +214,13 @@ public final class DeckEditorQuest extends DeckEditorBase { // Need to lower the top table and lessen the total height. // this.getTopTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 40, 726, 316)); this.getTopTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 50, 726, 299)); - this.getBottomTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 458, 726, 218)); + // Raise the bottom table. + // this.getBottomTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 458, 726, 218)); + this.getBottomTableWithCards().getTableDecorated().setBounds(new Rectangle(19, 444, 726, 218)); // Raise the remove button. // this.removeButton.setBounds(new Rectangle(180, 403, 146, 49)); - this.removeButton.setBounds(new Rectangle(180, 378, 146, 49)); + this.removeButton.setBounds(new Rectangle(180, 381, 146, 49)); // removeButton.setIcon(upIcon); this.removeButton.setFont(new java.awt.Font("Dialog", 0, 13)); this.removeButton.setText("Remove Card"); @@ -239,7 +241,7 @@ public final class DeckEditorQuest extends DeckEditorBase { this.addButton.setFont(new java.awt.Font("Dialog", 0, 13)); // Raise the add button. // this.addButton.setBounds(new Rectangle(23, 403, 146, 49)); - this.addButton.setBounds(new Rectangle(23, 378, 146, 49)); + this.addButton.setBounds(new Rectangle(23, 381, 146, 49)); this.analysisButton.setText("Deck Analysis"); this.analysisButton.addActionListener(new ActionListener() { @@ -251,7 +253,7 @@ public final class DeckEditorQuest extends DeckEditorBase { this.analysisButton.setFont(new java.awt.Font("Dialog", 0, 13)); // Raise the analysis button and move slightly to the right. // this.analysisButton.setBounds(new Rectangle(578, 426, 166, 25)); - this.analysisButton.setBounds(new Rectangle(582, 401, 166, 25)); + this.analysisButton.setBounds(new Rectangle(582, 404, 166, 25)); /** * Type filtering @@ -264,13 +266,13 @@ public final class DeckEditorQuest extends DeckEditorBase { // this.getFilterBoxes().getPlaneswalker().setBounds(558, 400, 85, 20); // this.getFilterBoxes().getArtifact().setBounds(638, 400, 58, 20); // this.getFilterBoxes().getEnchantment().setBounds(692, 400, 80, 20); - this.getFilterBoxes().getLand().setBounds(340, 375, 48, 20); - this.getFilterBoxes().getCreature().setBounds(385, 375, 65, 20); - this.getFilterBoxes().getSorcery().setBounds(447, 375, 62, 20); - this.getFilterBoxes().getInstant().setBounds(505, 375, 60, 20); - this.getFilterBoxes().getPlaneswalker().setBounds(558, 375, 85, 20); - this.getFilterBoxes().getArtifact().setBounds(638, 375, 58, 20); - this.getFilterBoxes().getEnchantment().setBounds(692, 375, 80, 20); + this.getFilterBoxes().getLand().setBounds(340, 378, 48, 20); + this.getFilterBoxes().getCreature().setBounds(385, 378, 65, 20); + this.getFilterBoxes().getSorcery().setBounds(447, 378, 62, 20); + this.getFilterBoxes().getInstant().setBounds(505, 378, 60, 20); + this.getFilterBoxes().getPlaneswalker().setBounds(558, 378, 85, 20); + this.getFilterBoxes().getArtifact().setBounds(638, 378, 58, 20); + this.getFilterBoxes().getEnchantment().setBounds(692, 378, 80, 20); final Font f = new Font("Tahoma", Font.PLAIN, 10); for (final JCheckBox box : this.getFilterBoxes().getAllTypes()) { @@ -289,12 +291,12 @@ public final class DeckEditorQuest extends DeckEditorBase { // this.getFilterBoxes().getRed().setBounds(460, 430, 40, 20); // this.getFilterBoxes().getGreen().setBounds(500, 430, 40, 20); // this.getFilterBoxes().getColorless().setBounds(540, 430, 40, 20); - this.getFilterBoxes().getWhite().setBounds(340, 405, 40, 20); - this.getFilterBoxes().getBlue().setBounds(380, 405, 40, 20); - this.getFilterBoxes().getBlack().setBounds(420, 405, 40, 20); - this.getFilterBoxes().getRed().setBounds(460, 405, 40, 20); - this.getFilterBoxes().getGreen().setBounds(500, 405, 40, 20); - this.getFilterBoxes().getColorless().setBounds(540, 405, 40, 20); + this.getFilterBoxes().getWhite().setBounds(340, 408, 40, 20); + this.getFilterBoxes().getBlue().setBounds(380, 408, 40, 20); + this.getFilterBoxes().getBlack().setBounds(420, 408, 40, 20); + this.getFilterBoxes().getRed().setBounds(460, 408, 40, 20); + this.getFilterBoxes().getGreen().setBounds(500, 408, 40, 20); + this.getFilterBoxes().getColorless().setBounds(540, 408, 40, 20); for (final JCheckBox box : this.getFilterBoxes().getAllColors()) { box.setOpaque(false); @@ -309,7 +311,9 @@ public final class DeckEditorQuest extends DeckEditorBase { // Need to raise the label for the top table. // this.getTopTableWithCards().getLabel().setBounds(new Rectangle(19, 365, 720, 31)); this.getTopTableWithCards().getLabel().setBounds(new Rectangle(19, 345, 720, 31)); - this.getBottomTableWithCards().getLabel().setBounds(new Rectangle(19, 672, 720, 31)); + // Need to raise the label for the bottom table. + // this.getBottomTableWithCards().getLabel().setBounds(new Rectangle(19, 672, 720, 31)); + this.getBottomTableWithCards().getLabel().setBounds(new Rectangle(19, 660, 720, 31)); // Do not lower statsLabel any lower, we want this to be visible at 1024 // x 768 screen size