Restored code that Jules removed, probably incorrectly

Author: shai-almog

CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java

@@ -2635,7 +2635,7 @@ protected boolean hasDragStarted(final int x, final int y) {
         if (getCurrentForm() == null) {
             return false;
         }
-        if (dragActivationCounter <= 0) {
+        if (dragActivationCounter == 0) {
             dragActivationX = x;
             dragActivationY = y;
             dragActivationCounter++;
@@ -7961,6 +7961,9 @@ public boolean isSimulator() {
      * @param s              the style object to draw
      */
     public void paintComponentBackground(Object nativeGraphics, int x, int y, int width, int height, Style s) {
+        if (width <= 0 || height <= 0) {
+            return;
+        }
         Image bgImageOrig = s.getBgImage();
         if (bgImageOrig == null) {
             if (s.getBackgroundType() >= Style.BACKGROUND_GRADIENT_LINEAR_VERTICAL) {

CodenameOne/src/com/codename1/ui/Component.java

@@ -3219,6 +3219,9 @@ protected Border getBorder() {
      * @param g the component graphics
      */
     void paintComponentBackground(Graphics g) {
+        if (isFlatten() || !opaque) {
+            return;
+        }
         paintBackgroundImpl(g);
     }
 

CodenameOne/src/com/codename1/ui/layouts/mig/Grid.java

@@ -1,16 +1,3 @@
-package com.codename1.ui.layouts.mig;
-
-import com.codename1.compat.java.util.Objects;
-import com.codename1.ui.Display;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.TreeSet;
 /*
  * License (BSD):
  * ==============
@@ -45,6 +32,20 @@
  *         Date: 2006-sep-08
  */
 
+package com.codename1.ui.layouts.mig;
+
+import com.codename1.compat.java.util.Objects;
+import com.codename1.ui.Display;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeSet;
+
 /**
  * Holds components in a grid. Does most of the logic behind the layout manager.
  */
@@ -197,12 +198,12 @@ public Grid(ContainerWrapper container, LC lc, AC rowConstr, AC colConstr, Map<?
                 continue;   // The "external" component should not be handled further.
             }
 
-            String sgX = rootCc.getHorizontal().getSizeGroup();
-            if (sgX != null) {
+            String sgX = rootCc.getHorizontal().getSizeGroup();
+            if (sgX != null) {
                 sizeGroupsX++;
             }
-            String sgY = rootCc.getVertical().getSizeGroup();
-            if (sgY != null) {
+            String sgY = rootCc.getVertical().getSizeGroup();
+            if (sgY != null) {
                 sizeGroupsY++;
             }
 
@@ -256,7 +257,7 @@ public Grid(ContainerWrapper container, LC lc, AC rowConstr, AC colConstr, Map<?
                     }
                 }
             } else {
-                if (cx >= 0 || cy >= 0) {
+                if (cx >= 0 && cy >= 0) {
                     if (cy >= 0) {
                         cellXY[0] = cx;
                         cellXY[1] = cy;
@@ -290,7 +291,7 @@ public Grid(ContainerWrapper container, LC lc, AC rowConstr, AC colConstr, Map<?
                 setCell(cellXY[1], cellXY[0], cell);
 
                 // Add a rectangle so we can know that spanned cells occupy more space.
-                if (spanx != 1 || spany != 1) {
+                if (spanx > 1 || spany > 1) {
                     spannedRects.add(new int[]{cellXY[0], cellXY[1], spanx, spany});
                 }
             }
@@ -1061,13 +1062,13 @@ private static synchronized void saveGrid(ComponentWrapper parComp, LinkedHashMa
 
         ArrayList<WeakCell> weakCells = new ArrayList<WeakCell>(grid.size());
 
-        for (Map.Entry<Integer, Cell> entry : grid.entrySet()) {
-            Integer xyInt = entry.getKey();
-            Cell cell = entry.getValue();
-            if (xyInt != null) {
-                int x = xyInt & 0x0000ffff;
-                int y = xyInt >> 16;
-
+        for (Map.Entry<Integer, Cell> entry : grid.entrySet()) {
+            Integer xyInt = entry.getKey();
+            Cell cell = entry.getValue();
+            if (xyInt != null) {
+                int x = xyInt & 0x0000ffff;
+                int y = xyInt >> 16;
+
                 for (CompWrap cw : cell.compWraps) {
                     weakCells.add(new WeakCell(cw.comp.getComponent(), x, y, cell.spanx, cell.spany));
                 }
@@ -1501,11 +1502,11 @@ private void clearGroupLinkBounds() {
             return;
         }
 
-        for (Map.Entry<String, Boolean> entry : linkTargetIDs.entrySet()) {
-            if (Boolean.TRUE.equals(entry.getValue())) {
-                LinkHandler.clearBounds(container.getLayout(), entry.getKey());
-            }
-        }
+        for (Map.Entry<String, Boolean> entry : linkTargetIDs.entrySet()) {
+            if (Boolean.TRUE.equals(entry.getValue())) {
+                LinkHandler.clearBounds(container.getLayout(), entry.getKey());
+            }
+        }
     }
 
     private void resetLinkValues(boolean parentSize, boolean compLinks) {
@@ -1620,8 +1621,8 @@ private int[] getAbsoluteDimBounds(CompWrap cw, int refSize, boolean isHor) {
 
         // If absolute, use those coordinates instead.
         if (pos != null) {
-                UnitValue stUV = pos[isHor ? 0 : 1];
-                UnitValue endUV = pos[isHor ? 2 : 3];
+                UnitValue stUV = pos[isHor ? 0 : 1];
+                UnitValue endUV = pos[isHor ? 2 : 3];
 
             int minSz = cw.getSize(LayoutUtil.MIN, isHor);
             int maxSz = cw.getSize(LayoutUtil.MAX, isHor);