Fixed background painting order for components. Previously the compon…

…ent's parent's background would be painted over top of the component's siblings when painting its background. This caused some elements in the form layer pane to disappear during animations. Fixes #2564
codenameone · Sep 28, 2018 · 0a6226e · 0a6226e
1 parent 2d6d723
commit 0a6226e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java b/CodenameOne/src/com/codename1/impl/CodenameOneImplementation.java
@@ -600,7 +600,6 @@ public void paintDirty() {
                         wrapper.setClip(dirty.getX(), dirty.getY(), d.getWidth(), d.getHeight());
                         cmp.setDirtyRegion(null);
                     }
-
                     cmp.paintComponent(wrapper);
                     getPaintableBounds(cmp, paintDirtyTmpRect);
                     int cmpAbsX = paintDirtyTmpRect.getX();

diff --git a/CodenameOne/src/com/codename1/ui/Component.java b/CodenameOne/src/com/codename1/ui/Component.java
@@ -2359,9 +2359,8 @@ private void drawPaintersImpl(com.codename1.ui.Graphics g, Component par, Compon
         int transY = par.getAbsoluteY() + par.getScrollY();
 
         g.translate(transX, transY);
-
-        ((Container) par).paintIntersecting(g, c, x, y, w, h, false);
-
+
+
         if (par.isBorderPainted()) {
             Border b = par.getBorder();
             if (b.isBackgroundPainter()) {
@@ -2386,6 +2385,7 @@ private void drawPaintersImpl(com.codename1.ui.Graphics g, Component par, Compon
             p.paint(g, rect);
         }
         par.paintBackground(g);
+        ((Container) par).paintIntersecting(g, c, x, y, w, h, false);
         g.translate(-transX, -transY);
     }
 
@@ -4978,7 +4978,6 @@ java.util.Set<Component> findNegativeScrolls(java.util.Set<Component> out) {
             out.add(this);
         }
         if (this instanceof Container) {
-            System.out.println("Container: "+this+", scrollY="+getScrollY());
             for (Component child : (Container)this) {
                 child.findNegativeScrolls(out);
             }

diff --git a/CodenameOne/src/com/codename1/ui/Container.java b/CodenameOne/src/com/codename1/ui/Container.java
@@ -1630,7 +1630,6 @@ void paintGlassImpl(Graphics g) {
     }
 
     void paintIntersecting(Graphics g, Component cmp, int x, int y, int w, int h, boolean above) {
-
         if (layout.isOverlapSupported() && components.contains(cmp)) {
             int indexOfComponent = components.indexOf(cmp);
 
@@ -1644,7 +1643,6 @@ void paintIntersecting(Graphics g, Component cmp, int x, int y, int w, int h, bo
                 endIndex = indexOfComponent;
             }
 
-            int size = components.size();
             for (int i = startIndex; i < endIndex; i++) {
                 Component cmp2 = (Component) components.get(i);
                 if(Rectangle.intersects(x, y, w, h,

diff --git a/CodenameOne/src/com/codename1/ui/Form.java b/CodenameOne/src/com/codename1/ui/Form.java
@@ -3842,7 +3842,6 @@ boolean moveScrollTowards(int direction, Component c) {
      */
     void fixNegativeScrolls() {
         java.util.Set<Component> negativeScrolls = getContentPane().findNegativeScrolls(new java.util.HashSet<Component>());
-        System.out.println("NegativeScrolls: "+negativeScrolls);
         for (Component cmp : negativeScrolls) {
             int x = cmp.getAbsoluteX()+cmp.getWidth()/2;
             int y = cmp.getAbsoluteY()+cmp.getHeight()/2;

diff --git a/CodenameOne/src/com/codename1/ui/layouts/BorderLayout.java b/CodenameOne/src/com/codename1/ui/layouts/BorderLayout.java
@@ -577,6 +577,14 @@ public Component getEast() {
     public Component getWest() {
         return getComponentImpl(portraitWest, WEST);
     }
+
+    /**
+     * Returns overlay component.
+     * @return The overlay component.
+     */
+    public Component getOverlay() {
+        return overlay;
+    }
 
     /**
      * {@inheritDoc}