fix the order of transformations

I got it the other way around.. Also change the test to better catch that.
googlefonts · Aug 16, 2021 · 2a3747f · 2a3747f
1 parent c195674
commit 2a3747f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/nanoemoji/write_font.py b/src/nanoemoji/write_font.py
@@ -278,7 +278,7 @@ def _update_paint_glyph(paint):
             if is_transform(child_paint) and is_gradient(child_paint.paint):
                 child_paint = child_paint.paint.apply_transform(
                     Affine2D.compose_ltr(
-                        (reuse_result.transform.inverse(), child_paint.gettransform())
+                        (child_paint.gettransform(), reuse_result.transform.inverse())
                     )
                 )
             return transformed(

diff --git a/tests/transformed_gradient_reuse.svg b/tests/transformed_gradient_reuse.svg
diff --git a/tests/transformed_gradient_reuse.ttx b/tests/transformed_gradient_reuse.ttx
@@ -143,12 +143,12 @@
           <Glyph value="e000.0"/>
         </Paint>
         <Transform>
-          <xx value="1.0"/>
+          <xx value="0.5"/>
           <yx value="0.0"/>
           <xy value="0.0"/>
-          <yy value="1.0"/>
-          <dx value="57.42188"/>
-          <dy value="0.0"/>
+          <yy value="0.5"/>
+          <dx value="28.711"/>
+          <dy value="50.0"/>
         </Transform>
       </Paint>
     </LayerList>
@@ -158,8 +158,8 @@
         <ClipBox Format="1">
           <xMin value="8"/>
           <yMin value="30"/>
-          <xMax value="92"/>
-          <yMax value="58"/>
+          <xMax value="46"/>
+          <yMax value="80"/>
         </ClipBox>
       </Clip>
     </ClipList>