From ff0f66c003103ff2d77027153dcb4dd2e1982d22 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Wed, 24 Nov 2010 14:33:28 +0000 Subject: [PATCH] Moved card description component on top. --- .../main/java/mage/client/game/BattlefieldPanel.java | 10 ---------- .../src/main/java/mage/client/game/GamePanel.java | 9 +++++---- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java index 5184566c90b..c524fb46ef3 100644 --- a/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java +++ b/Mage.Client/src/main/java/mage/client/game/BattlefieldPanel.java @@ -36,14 +36,9 @@ package mage.client.game; import java.awt.Component; import java.awt.Dimension; -import java.awt.Image; import java.awt.Rectangle; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.awt.image.BufferedImage; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -54,16 +49,11 @@ import javax.swing.JComponent; import javax.swing.JScrollPane; import mage.cards.MagePermanent; -import mage.client.MageFrame; import mage.client.cards.BigCard; -import mage.client.cards.Card; import mage.client.cards.Permanent; -import mage.client.plugins.adapters.MageMouseAdapter; -import mage.client.plugins.adapters.MageMouseMotionAdapter; import mage.client.plugins.impl.Plugins; import mage.client.util.Config; import mage.client.util.DefaultActionCallback; -import mage.client.util.ImageHelper; import mage.view.PermanentView; /** diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 57cf1a19f52..f20b2672c0f 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -574,6 +574,11 @@ public class GamePanel extends javax.swing.JPanel { pnlGameInfoLayout.setVerticalGroup( pnlGameInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(pnlGameInfoLayout.createSequentialGroup() + .addComponent(bigCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(0, 0, 0) + .addComponent(feedbackPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 109, javax.swing.GroupLayout.PREFERRED_SIZE) + .addGap(10, 10, 10) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(pnlGameInfoLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addComponent(lblPhase) .addComponent(txtPhase, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) @@ -594,11 +599,7 @@ public class GamePanel extends javax.swing.JPanel { .addComponent(lblPriority) .addComponent(txtPriority, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(feedbackPanel, javax.swing.GroupLayout.PREFERRED_SIZE, 109, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) .addComponent(stack, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addGap(0, 0, 0) - .addComponent(bigCard, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 164, Short.MAX_VALUE) .addComponent(pnlReplay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)