GUI: deck editor improves:

* Fixed broken DeckArea form (form/java files synced);
* Improved panel sizes and scrolls fixes (small screens support, see #6881);

Mage.Client/src/main/java/mage/client/MageFrame.java

@@ -881,7 +881,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
         popupDebug.add(menuDebugTestCardRenderModesDialog);
 
         setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
-        setMinimumSize(new java.awt.Dimension(1024, 768));
+        setMinimumSize(new java.awt.Dimension(1024, 500));
 
         desktopPane.setBackground(new java.awt.Color(204, 204, 204));
 

Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java

@@ -73,8 +73,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
             }
             trimGrid();
             layoutGrid();
-            cardScroll.revalidate();
-            cardScroll.repaint();
+            repaintGrid();
         }
     }
 
@@ -315,8 +314,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
             // Remove empty rows / cols / spaces in stacks
             trimGrid();
             layoutGrid();
-            cardScroll.revalidate();
-            cardScroll.repaint();
+            repaintGrid();
         } else {
             // Add new cards to grid
             for (CardView card : cards) {
@@ -325,14 +323,14 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
                 eventSource.fireEvent(card, ClientEventType.ADD_SPECIFIC_CARD);
             }
             layoutGrid();
-            cardContent.repaint();
+            repaintGrid();
         }
     }
 
     public void changeGUISize() {
         layoutGrid();
         cardScroll.getVerticalScrollBar().setUnitIncrement(CardRenderer.getCardTopHeight(getCardWidth()));
-        cardContent.repaint();
+        repaintGrid();
     }
 
     public void cleanUp() {
@@ -386,7 +384,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
         }
         trimGrid();
         layoutGrid();
-        cardContent.repaint();
+        repaintGrid();
     }
 
     public DeckCardLayout getCardLayout() {
@@ -710,6 +708,47 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
         // Editting mode
         this.mode = Constants.DeckEditorMode.LIMITED_BUILDING;
 
+        // Content
+        cardContent = new JLayeredPane();
+        cardContent.setLayout(null);
+        cardContent.setOpaque(false);
+        cardContent.addMouseListener(new MouseAdapter() {
+            private boolean isDragging = false;
+
+            @Override
+            public void mousePressed(MouseEvent e) {
+                if (SwingUtilities.isLeftMouseButton(e)) {
+                    isDragging = true;
+                    beginSelectionDrag(e.getX(), e.getY(), e.isShiftDown());
+                    updateSelectionDrag(e.getX(), e.getY());
+                }
+            }
+
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if (isDragging) {
+                    isDragging = false;
+                    updateSelectionDrag(e.getX(), e.getY());
+                    endSelectionDrag(e.getX(), e.getY());
+                }
+            }
+        });
+        cardContent.addMouseMotionListener(new MouseAdapter() {
+            @Override
+            public void mouseDragged(MouseEvent e) {
+                updateSelectionDrag(e.getX(), e.getY());
+            }
+        });
+        cardScroll = new JScrollPane(cardContent,
+                ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
+                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
+        cardScroll.setOpaque(false);
+        cardScroll.getViewport().setOpaque(false);
+        cardScroll.setViewportBorder(BorderFactory.createEmptyBorder());
+        cardScroll.setBorder(BorderFactory.createLineBorder(Color.gray, 1));
+        cardScroll.getVerticalScrollBar().setUnitIncrement(CardRenderer.getCardTopHeight(getCardWidth()));
+        this.add(cardScroll, BorderLayout.CENTER);
+
         // Toolbar
         sortButton = new JButton("Sort");
         filterButton = new JButton("Filter");
@@ -757,56 +796,15 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
                 cardSizeMod = (float) Math.pow(2, sliderFrac);
                 // Update grid
                 layoutGrid();
-                cardContent.repaint();
+                repaintGrid();
             }
         });
-        cardSizeSliderLabel = new JLabel("Card Size:");
+        cardSizeSliderLabel = new JLabel("Card size:");
         sliderPanel.add(cardSizeSliderLabel);
         sliderPanel.add(cardSizeSlider);
         toolbar.add(sliderPanel, BorderLayout.EAST);
         this.add(toolbar, BorderLayout.NORTH);
 
-        // Content
-        cardContent = new JLayeredPane();
-        cardContent.setLayout(null);
-        cardContent.setOpaque(false);
-        cardContent.addMouseListener(new MouseAdapter() {
-            private boolean isDragging = false;
-
-            @Override
-            public void mousePressed(MouseEvent e) {
-                if (SwingUtilities.isLeftMouseButton(e)) {
-                    isDragging = true;
-                    beginSelectionDrag(e.getX(), e.getY(), e.isShiftDown());
-                    updateSelectionDrag(e.getX(), e.getY());
-                }
-            }
-
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                if (isDragging) {
-                    isDragging = false;
-                    updateSelectionDrag(e.getX(), e.getY());
-                    endSelectionDrag(e.getX(), e.getY());
-                }
-            }
-        });
-        cardContent.addMouseMotionListener(new MouseAdapter() {
-            @Override
-            public void mouseDragged(MouseEvent e) {
-                updateSelectionDrag(e.getX(), e.getY());
-            }
-        });
-        cardScroll = new JScrollPane(cardContent,
-                ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED,
-                ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        cardScroll.setOpaque(false);
-        cardScroll.getViewport().setOpaque(false);
-        cardScroll.setViewportBorder(BorderFactory.createEmptyBorder());
-        cardScroll.setBorder(BorderFactory.createLineBorder(Color.gray, 1));
-        cardScroll.getVerticalScrollBar().setUnitIncrement(CardRenderer.getCardTopHeight(getCardWidth()));
-        this.add(cardScroll, BorderLayout.CENTER);
-
         // Insert arrow
         insertArrow = new JLabel();
         insertArrow.setSize(20, 20);
@@ -1230,7 +1228,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
 
         // And finally rerender
         layoutGrid();
-        repaint();
+        repaintGrid();
     }
 
     public void reselectBy() {
@@ -1340,7 +1338,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
 
         // And finally rerender
         layoutGrid();
-        repaint();
+        repaintGrid();
     }
 
     private static final Pattern pattern = Pattern.compile(".*Add(.*)(\\{[WUBRGXC]\\})");
@@ -1568,8 +1566,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
                 }
 
                 layoutGrid();
-                cardScroll.revalidate();
-                repaint();
+                repaintGrid();
                 JOptionPane.showMessageDialog(null, "Added " + pimpedCards.size() + " cards.  You can select them and the originals by choosing 'Multiples'");
             }
         }
@@ -1609,8 +1606,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
         }
         cardGrid = newCardGrid;
         layoutGrid();
-        cardScroll.revalidate();
-        repaint();
+        repaintGrid();
     }
 
     // Update the contents of the card grid
@@ -1734,10 +1730,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
         if (didModify) {
             // Update layout
             layoutGrid();
-
-            // Update draw
-            cardScroll.revalidate();
-            repaint();
+            repaintGrid();
         }
     }
 
@@ -1877,9 +1870,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
             eventSource.fireEvent(card, ClientEventType.ADD_SPECIFIC_CARD);
             // Update layout
             layoutGrid();
-            // Update draw
-            cardScroll.revalidate();
-            repaint();
+            repaintGrid();
         }
     }
 
@@ -2083,6 +2074,12 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg
         return (int) (1.4 * getCardWidth());
     }
 
+    private void repaintGrid() {
+        cardScroll.revalidate();
+        cardScroll.repaint();
+        repaint();
+    }
+
     /**
      * Position all of the card views correctly
      */

Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.form

@@ -11,39 +11,45 @@
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,121,0,0,4,76"/>
   </AuxValues>
 
-  <Layout>
-    <DimensionLayout dim="0">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="deckAreaSplitPane" alignment="0" pref="918" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-    <DimensionLayout dim="1">
-      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="deckAreaSplitPane" alignment="0" pref="377" max="32767" attributes="0"/>
-      </Group>
-    </DimensionLayout>
-  </Layout>
+  <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
   <SubComponents>
     <Container class="javax.swing.JSplitPane" name="deckAreaSplitPane">
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="null"/>
         </Property>
-        <Property name="resizeWeight" type="double" value="0.6"/>
+        <Property name="dividerSize" type="int" value="10"/>
+        <Property name="resizeWeight" type="double" value="0.5"/>
       </Properties>
+      <Constraints>
+        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
+          <BorderConstraints direction="Center"/>
+        </Constraint>
+      </Constraints>
 
       <Layout class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
       <SubComponents>
-        <Component class="mage.client.cards.DragCardGrid" name="dragCardGrid1">
+        <Component class="mage.client.cards.DragCardGrid" name="deckList">
+          <Properties>
+            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[200, 56]"/>
+            </Property>
+          </Properties>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
               <JSplitPaneConstraints position="left"/>
             </Constraint>
           </Constraints>
         </Component>
-        <Component class="mage.client.cards.DragCardGrid" name="dragCardGrid2">
+        <Component class="mage.client.cards.DragCardGrid" name="sideboardList">
+          <Properties>
+            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[200, 56]"/>
+            </Property>
+          </Properties>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
               <JSplitPaneConstraints position="right"/>

Mage.Client/src/main/java/mage/client/deckeditor/DeckArea.java

@@ -1,9 +1,3 @@
-
- /*
- * DeckArea.java
- *
- * Created on Feb 18, 2010, 3:10:39 PM
- */
 package mage.client.deckeditor;
 
 import mage.cards.Card;
@@ -26,7 +20,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- *
  * @author BetaSteward_at_googlemail.com
  */
 public class DeckArea extends javax.swing.JPanel {
@@ -298,21 +291,19 @@ public class DeckArea extends javax.swing.JPanel {
         deckList = new mage.client.cards.DragCardGrid();
         sideboardList = new mage.client.cards.DragCardGrid();
 
+        setLayout(new java.awt.BorderLayout());
+
         deckAreaSplitPane.setBorder(null);
-        deckAreaSplitPane.setResizeWeight(0.6);
+        deckAreaSplitPane.setDividerSize(10);
+        deckAreaSplitPane.setResizeWeight(0.5);
+
+        deckList.setMinimumSize(new java.awt.Dimension(200, 56));
         deckAreaSplitPane.setLeftComponent(deckList);
+
+        sideboardList.setMinimumSize(new java.awt.Dimension(200, 56));
         deckAreaSplitPane.setRightComponent(sideboardList);
 
-        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(deckAreaSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 918, Short.MAX_VALUE)
-        );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(deckAreaSplitPane, javax.swing.GroupLayout.DEFAULT_SIZE, 377, Short.MAX_VALUE)
-        );
+        add(deckAreaSplitPane, java.awt.BorderLayout.CENTER);
     }// </editor-fold>//GEN-END:initComponents
 
     public DragCardGrid getDeckList() {

Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.form

@@ -20,6 +20,11 @@
   <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
   <SubComponents>
     <Component class="mage.client.deckeditor.DeckEditorPanel" name="deckEditorPanel1">
+      <Properties>
+        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[1000, 500]"/>
+        </Property>
+      </Properties>
       <Constraints>
         <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
           <BorderConstraints direction="Center"/>

Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPane.java

@@ -74,6 +74,7 @@ public class DeckEditorPane extends MagePane {
         deckEditorPanel1 = new mage.client.deckeditor.DeckEditorPanel();
         filler1 = new javax.swing.Box.Filler(new java.awt.Dimension(0, 0), new java.awt.Dimension(0, 10), new java.awt.Dimension(0, 32767));
 
+        deckEditorPanel1.setMinimumSize(new java.awt.Dimension(1000, 500));
         getContentPane().add(deckEditorPanel1, java.awt.BorderLayout.CENTER);
         getContentPane().add(filler1, java.awt.BorderLayout.NORTH);
     }// </editor-fold>//GEN-END:initComponents

Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.form

@@ -33,6 +33,7 @@
   <SubComponents>
     <Container class="javax.swing.JSplitPane" name="panelRight">
       <Properties>
+        <Property name="dividerSize" type="int" value="10"/>
         <Property name="orientation" type="int" value="0"/>
         <Property name="resizeWeight" type="double" value="0.5"/>
       </Properties>
@@ -47,6 +48,11 @@
           </Constraints>
         </Component>
         <Component class="mage.client.deckeditor.DeckArea" name="deckArea">
+          <Properties>
+            <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+              <Dimension value="[200, 56]"/>
+            </Property>
+          </Properties>
           <Constraints>
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
               <JSplitPaneConstraints position="bottom"/>

Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java

@@ -864,9 +864,12 @@ public class DeckEditorPanel extends javax.swing.JPanel {
         txtTimeRemaining = new javax.swing.JTextField();
         deckLegalityDisplay = new mage.client.deckeditor.DeckLegalityPanel();
 
+        panelRight.setDividerSize(10);
         panelRight.setOrientation(javax.swing.JSplitPane.VERTICAL_SPLIT);
         panelRight.setResizeWeight(0.5);
         panelRight.setTopComponent(cardSelector);
+
+        deckArea.setMinimumSize(new java.awt.Dimension(200, 56));
         panelRight.setBottomComponent(deckArea);
 
         panelDeck.setOpaque(false);
@@ -1193,7 +1196,7 @@ public class DeckEditorPanel extends javax.swing.JPanel {
                         .addGroup(layout.createSequentialGroup()
                                 .addComponent(panelLeft, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(panelRight, javax.swing.GroupLayout.PREFERRED_SIZE, 890, Short.MAX_VALUE))
+                                .addComponent(panelRight, javax.swing.GroupLayout.DEFAULT_SIZE, 890, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
                 layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)