Fix issue with viewbox not being applied properly (#38)

Author: LaurenzV

src/render/mod.rs

@@ -26,12 +26,16 @@ pub fn tree_to_x_object(
     ctx.deferrer.push();
 
     let mut child_content = Content::new();
+    child_content.save_state();
+    child_content.transform(ctx.get_viewbox_transform().as_array());
 
     // The root of a tree is always a group, so we can directly iterate over the children
     for el in tree.root.children() {
         el.render(writer, &mut child_content, ctx);
     }
 
+    child_content.restore_state();
+
     let child_content_stream = ctx.finish_content(child_content);
 
     let mut x_object = writer.form_xobject(x_ref, &child_content_stream);
@@ -43,7 +47,7 @@ pub fn tree_to_x_object(
 
     x_object.bbox(Rect::new(0.0, 0.0, ctx.size.width() as f32, ctx.size.height() as f32));
     // Apply the base transform
-    x_object.matrix(ctx.get_base_transform().as_array());
+    x_object.matrix(ctx.initial_transform.as_array());
     x_object.finish();
 
     ctx.deferrer.add_x_object(x_ref)

src/util/context.rs

@@ -48,15 +48,9 @@ impl Context {
         self.deferrer.alloc_ref()
     }
 
-    /// Get the base transform that needs to be applied before rendering everything else (
-    /// i.e. the initial transform passed by the user + the view box transform to account for the
-    /// view box of the SVG).
-    pub fn get_base_transform(&self) -> Transform {
-        let mut base_transform = self.initial_transform;
-        let view_box_transform =
-            view_box_to_transform(self.view_box.rect, self.view_box.aspect, self.size);
-        base_transform.append(&view_box_transform);
-        base_transform
+    // Get the viewbox transform
+    pub fn get_viewbox_transform(&self) -> Transform {
+        view_box_to_transform(self.view_box.rect, self.view_box.aspect, self.size)
     }
 
     /// Returns a [`usvg` Rect](usvg::Rect) with the dimensions of the whole SVG.