A more extensive fix for #3692

Previous fix didn't cover the auto-sizing method.

Author: shai-almog

CodenameOne/src/com/codename1/ui/layouts/GridLayout.java

@@ -161,43 +161,49 @@ public static Container encloseIn(int columns, Component... cmp) {
     private boolean isLandscapeMode() {
         return landscapeRows > -1 && (!Display.getInstance().isPortrait());
     }
-    
-    private void autoSizeCols(Container parent, int width, boolean landscapeMode) {
+
+    private int autoSizeCols(Container parent, int width, boolean landscapeMode) {
+        int numOfcomponents = parent.getComponentCount();
+        int totalComponentCount = numOfcomponents;
         if(isAutoFit()) {
-            int numOfcomponents = parent.getComponentCount();
             int maxWidth = 0;
             for(int iter = 0 ; iter < numOfcomponents ; iter++) {
                 Component cmp = parent.getComponentAt(iter);
-                Style s = cmp.getStyle();
-                maxWidth = Math.max(cmp.getPreferredW() + s.getHorizontalMargins(), maxWidth);
+                if(hideZeroSized && cmp.isHidden()) {
+                    totalComponentCount--;
+                } else {
+                    Style s = cmp.getStyle();
+                    maxWidth = Math.max(cmp.getPreferredW() + s.getHorizontalMargins(), maxWidth);
+                }
             }
             if(width < maxWidth) {
                 width = Display.getInstance().getDisplayWidth();
             }
             if(landscapeMode) {
-                // prevent arithmentic exception
+                // prevent arithmetic exception
                 if(maxWidth <= 0) {
                     landscapeColumns = 1;
                 } else {
                     landscapeColumns = Math.max(width / maxWidth, 1);
                 }
-                landscapeRows = Math.max(1, numOfcomponents / landscapeColumns);
-                if(numOfcomponents % landscapeColumns > 0 && numOfcomponents > landscapeColumns) {
+                landscapeRows = Math.max(1, totalComponentCount / landscapeColumns);
+                if(totalComponentCount % landscapeColumns > 0 && totalComponentCount > landscapeColumns) {
                     landscapeRows++;
-                } 
+                }
             } else {
                 // prevent arithmentic exception
                 if(maxWidth <= 0) {
                     portraitColumns = 1;
                 } else {
                     portraitColumns = Math.max(width / maxWidth, 1);
                 }
-                portraitRows = Math.max(1, numOfcomponents / portraitColumns);
-                if(numOfcomponents % portraitColumns > 0 && numOfcomponents > portraitColumns) {
+                portraitRows = Math.max(1, totalComponentCount / portraitColumns);
+                if(totalComponentCount % portraitColumns > 0 && totalComponentCount > portraitColumns) {
                     portraitRows++;
-                } 
+                }
             }
         }
+        return totalComponentCount;
     }
 
     /**
@@ -276,11 +282,11 @@ public void layoutContainer(Container parent) {
 
     /**
      * {@inheritDoc}
-     */    
-    public Dimension getPreferredSize(Container parent) {        
+     */
+    public Dimension getPreferredSize(Container parent) {
         int width = 0;
         int height = 0;
-        
+
         int numOfcomponents = parent.getComponentCount();
         int totalComponentCount = numOfcomponents;
         for(int i=0; i< numOfcomponents; i++){
@@ -293,7 +299,7 @@ public Dimension getPreferredSize(Container parent) {
             }
         }
 
-        boolean landscapeMode = isLandscapeMode();        
+        boolean landscapeMode = isLandscapeMode();
         autoSizeCols(parent, parent.getWidth(), landscapeMode);
         int rows, columns;
         if(landscapeMode) {
@@ -307,18 +313,18 @@ public Dimension getPreferredSize(Container parent) {
         if(columns > 1){
             width = width*columns;
         }
-        
+
         if(rows > 1){
             if(totalComponentCount>rows*columns){ //if there are more components than planned
-               height =  height * (totalComponentCount/columns + (totalComponentCount%columns == 0 ? 0 : 1));
+                height =  height * (totalComponentCount/columns + (totalComponentCount%columns == 0 ? 0 : 1));
             }else{
                 height = height*rows;
             }
         }
-        
+
         Style s = parent.getStyle();
         return new Dimension(width + s.getHorizontalPadding(),
-            height + s.getVerticalPadding());
+                height + s.getVerticalPadding());
     }
 
     /**