diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 36dbcf55fc2..457d4ae4768 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -60,6 +60,7 @@ import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JDesktopPane; +import javax.swing.JFrame; import javax.swing.JLabel; import javax.swing.JLayeredPane; import javax.swing.JOptionPane; @@ -140,7 +141,7 @@ public class MageFrame extends javax.swing.JFrame { initComponents(); setSize(1024,768); - //this.setExtendedState(JFrame.MAXIMIZED_BOTH); + this.setExtendedState(JFrame.MAXIMIZED_BOTH); session = new Session(this); connectDialog = new ConnectDialog(); diff --git a/Mage.Client/src/main/java/mage/client/cards/Cards.java b/Mage.Client/src/main/java/mage/client/cards/Cards.java index dc3fa9a2efb..100a99dd41a 100644 --- a/Mage.Client/src/main/java/mage/client/cards/Cards.java +++ b/Mage.Client/src/main/java/mage/client/cards/Cards.java @@ -178,4 +178,12 @@ public class Cards extends javax.swing.JPanel { public void setDontDisplayTapped(boolean dontDisplayTapped) { this.dontDisplayTapped = dontDisplayTapped; } + + public void setHScrollSpeed(int unitIncrement) { + jScrollPane1.getHorizontalScrollBar().setUnitIncrement(unitIncrement); + } + + public void setVScrollSpeed(int unitIncrement) { + jScrollPane1.getVerticalScrollBar().setUnitIncrement(unitIncrement); + } } diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsStorage.java b/Mage.Client/src/main/java/mage/client/cards/CardsStorage.java index dee89a5909f..e804cba9671 100644 --- a/Mage.Client/src/main/java/mage/client/cards/CardsStorage.java +++ b/Mage.Client/src/main/java/mage/client/cards/CardsStorage.java @@ -20,9 +20,6 @@ public class CardsStorage { if (CardUtil.isLand(card)) { landCards.add(card); } - if (card.getName().contains("Pledge")) { - System.out.println(card.getName()); - } } } } 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 b6084332f8c..bfe052dc2eb 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -85,6 +85,8 @@ public class GamePanel extends javax.swing.JPanel { public GamePanel() { initComponents(); + hand.setHScrollSpeed(8); + //FIXME: remove from here try { // Override layout (I can't edit generated code)