Graphics.useMatrixTranslation: route g.translate through impl matrix (GH-3302)

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

@@ -800,7 +800,19 @@ public void paintDirty() {
                     continue;
                 }
                 paintQueueTemp[iter] = null;
-                wrapper.translate(-wrapper.getTranslateX(), -wrapper.getTranslateY());
+                // Reset wrapper graphics to a clean state before painting
+                // the next queued animation. matrixFrameworkTranslateX
+                // returns the right anchor (xTranslate in legacy mode,
+                // matrixFrameworkX in matrix mode) so the translate-based
+                // reset brings the wrapper to identity in both modes.
+                // resetAffine() then clears any leftover user
+                // scale/rotate; in matrix mode it also re-applies the
+                // framework anchor it had just zeroed, but since we
+                // already translate(-tx, -ty)'d to zero it stays at
+                // identity for the upcoming paintComponent.
+                int wtx = wrapper.matrixFrameworkTranslateX();
+                int wty = wrapper.matrixFrameworkTranslateY();
+                wrapper.translate(-wtx, -wty);
                 wrapper.resetAffine();
                 wrapper.setClip(0, 0, dwidth, dheight);
                 if (ani instanceof Component) {

CodenameOne/src/com/codename1/maps/MapComponent.java

@@ -33,6 +33,7 @@
 import com.codename1.ui.Graphics;
 import com.codename1.ui.Image;
 import com.codename1.ui.ImageFactory;
+import com.codename1.ui.Transform;
 import com.codename1.ui.events.ActionEvent;
 import com.codename1.ui.events.ActionListener;
 import com.codename1.ui.geom.Dimension;
@@ -269,11 +270,23 @@ public void paintBackground(Graphics g) {
                 tx = -tx * (float) (scaleX - getWidth()) / sx;
                 float ty = (float) zoomCenterY / (float) getHeight();
                 ty = -ty * (float) (scaleY - getHeight()) / sy;
-                g.translate((int) tx, (int) ty);
-                g.scale(sx, sy);
-                paintmap(g);
-                g.resetAffine();
-                g.translate(-(int) tx, -(int) ty);
+                if (Graphics.useMatrixTranslation) {
+                    // Matrix mode: resetAffine wipes the impl matrix to
+                    // identity, which destroys the framework painting-chain
+                    // translates the matrix carries. Use save/restore the
+                    // impl matrix around the scale + user-translate instead.
+                    Transform savedMatrix = g.getTransform();
+                    g.translate((int) tx, (int) ty);
+                    g.scale(sx, sy);
+                    paintmap(g);
+                    g.setTransform(savedMatrix);
+                } else {
+                    g.translate((int) tx, (int) ty);
+                    g.scale(sx, sy);
+                    paintmap(g);
+                    g.resetAffine();
+                    g.translate(-(int) tx, -(int) ty);
+                }
             } else {
                 g.translate(-translateX, -translateY);
                 paintmap(g);

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

@@ -3031,9 +3031,12 @@ void internalPaintImpl(Graphics g, boolean paintIntersects) {
     public void paintIntersectingComponentsAbove(Graphics g) {
         Container parent = getParent();
         Component component = this;
-        int tx = g.getTranslateX();
-        int ty = g.getTranslateY();
-
+        // Snapshot-reset translate -- matrixFrameworkTranslateX returns
+        // xTranslate in legacy mode and the matrixFrameworkX shadow in
+        // matrix mode so the parent walk below paints each ancestor at
+        // its screen-absolute position.
+        int tx = g.matrixFrameworkTranslateX();
+        int ty = g.matrixFrameworkTranslateY();
         g.translate(-tx, -ty);
         int x1 = getAbsoluteX() + getScrollX();
         int y1 = getAbsoluteY() + getScrollY();
@@ -3056,7 +3059,6 @@ public void paintIntersectingComponentsAbove(Graphics g) {
             parent = parent.getParent();
         }
         g.translate(tx, ty);
-
     }
 
     /// Paints the UI for the scrollbars on the component, this will be invoked only
@@ -3344,8 +3346,8 @@ private void drawPainters(Graphics g, Component par, Component c,
                 paintBackgroundImpl(tg);
                 putClientProperty("$FLAT", i);
             }
-            int tx = g.getTranslateX();
-            int ty = g.getTranslateY();
+            int tx = g.matrixFrameworkTranslateX();
+            int ty = g.matrixFrameworkTranslateY();
             g.translate(-tx + absX, -ty + absY);
             g.drawImage(i, 0, 0);
             g.translate(tx - absX, ty - absY);

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

@@ -2186,8 +2186,12 @@ public void paint(Graphics g) {
             paintElevatedPane(g);
         }
 
-        int tx = g.getTranslateX();
-        int ty = g.getTranslateY();
+        // Snapshot-reset translate so glass/tensile draw at screen-
+        // absolute coords. matrixFrameworkTranslateX returns the right
+        // anchor for both modes (legacy: xTranslate; matrix mode:
+        // matrixFrameworkX shadow).
+        int tx = g.matrixFrameworkTranslateX();
+        int ty = g.matrixFrameworkTranslateY();
         g.translate(-tx, -ty);
         if (sidemenuBarTranslation > 0) {
             g.translate(sidemenuBarTranslation, 0);

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

@@ -7796,8 +7796,8 @@ protected void drawImage(Graphics g, Object nativeGraphics, int x, int y) {
             g.concatenateAlpha(fgAlpha);
         }
         if (rotated != 0) {
-            int tX = g.getTranslateX();
-            int tY = g.getTranslateY();
+            int tX = g.matrixFrameworkTranslateX();
+            int tY = g.matrixFrameworkTranslateY();
             g.translate(-tX, -tY);
             g.rotate((float) Math.toRadians(rotated % 360), tX + x + width / 2, tY + y + height / 2);
             g.drawString(text, tX + x + width / 2 - w / 2, tY + y + height / 2 - h / 2);
@@ -7837,8 +7837,8 @@ protected void drawImage(Graphics g, Object nativeGraphics, int x, int y, int w,
         }
         //int paddingPixels = Display.getInstance().convertToPixels(padding, true);
         if (rotated != 0) {
-            int tX = g.getTranslateX();
-            int tY = g.getTranslateY();
+            int tX = g.matrixFrameworkTranslateX();
+            int tY = g.matrixFrameworkTranslateY();
             g.translate(-tX, -tY);
             g.rotate((float) Math.toRadians(rotated % 360), tX + x + w / 2, tY + y + h / 2);
             g.drawString(text, tX + x + w / 2 - ww / 2, tY + y);

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

@@ -1063,8 +1063,13 @@ void paintGlassImpl(Graphics g) {
             return;
         }
         if (glassPane != null) {
-            int tx = g.getTranslateX();
-            int ty = g.getTranslateY();
+            // matrixFrameworkTranslateX returns xTranslate in legacy mode
+            // and the matrixFrameworkX shadow in matrix mode; the translate-
+            // based snapshot reset brings the impl matrix to identity in
+            // both modes so glassPane.paint draws at the form's screen
+            // coords via getBounds().
+            int tx = g.matrixFrameworkTranslateX();
+            int ty = g.matrixFrameworkTranslateY();
             g.translate(-tx, -ty);
             glassPane.paint(g, getBounds());
             g.translate(tx, ty);