Fix Image fit

@@ -4,6 +4,7 @@
 
 
 - Update dependency to barcode ^1.5.0
 - Update dependency to barcode ^1.5.0
 - Update type1 font warning url
 - Update type1 font warning url
+- Fix Image fit
 
 
 ## 1.4.0
 ## 1.4.0
 
 

@@ -18,9 +18,73 @@
 
 
 part of widget;
 part of widget;
 
 
+void _paintImage({
+  @required PdfGraphics canvas,
+  @required PdfRect rect,
+  @required PdfImage image,
+  double scale = 1.0,
+  BoxFit fit,
+  Alignment alignment = Alignment.center,
+}) {
+  assert(canvas != null);
+  assert(image != null);
+  assert(alignment != null);
+  final PdfPoint outputSize = rect.size;
+  final PdfPoint inputSize =
+      PdfPoint(image.width.toDouble(), image.height.toDouble());
+  fit ??= BoxFit.scaleDown;
+  final FittedSizes fittedSizes = applyBoxFit(
+      fit, PdfPoint(inputSize.x / scale, inputSize.y / scale), outputSize);
+  final PdfPoint sourceSize =
+      PdfPoint(fittedSizes.source.x * scale, fittedSizes.source.y * scale);
+  final PdfPoint destinationSize = fittedSizes.destination;
+  final double halfWidthDelta = (outputSize.x - destinationSize.x) / 2.0;
+  final double halfHeightDelta = (outputSize.y - destinationSize.y) / 2.0;
+  final double dx = halfWidthDelta + alignment.x * halfWidthDelta;
+  final double dy = halfHeightDelta + alignment.y * halfHeightDelta;
+
+  final PdfPoint destinationPosition = rect.topLeft.translate(dx, dy);
+  final PdfRect destinationRect =
+      PdfRect.fromPoints(destinationPosition, destinationSize);
+  final PdfRect sourceRect = alignment.inscribe(
+    sourceSize,
+    PdfRect.fromPoints(PdfPoint.zero, inputSize),
+  );
+  _drawImageRect(canvas, image, sourceRect, destinationRect);
+}
+
+void _drawImageRect(PdfGraphics canvas, PdfImage image, PdfRect sourceRect,
+    PdfRect destinationRect) {
+  final double fw = destinationRect.width / sourceRect.width;
+  final double fh = destinationRect.height / sourceRect.height;
+
+  canvas.saveContext();
+  canvas
+    ..drawRect(
+      destinationRect.x,
+      destinationRect.y,
+      destinationRect.width,
+      destinationRect.height,
+    )
+    ..clipPath()
+    ..drawImage(
+      image,
+      destinationRect.x - sourceRect.x * fw,
+      destinationRect.y - sourceRect.y * fh,
+      image.width.toDouble() * fw,
+      image.height.toDouble() * fh,
+    )
+    ..restoreContext();
+}
+
 class Image extends Widget {
 class Image extends Widget {
-  Image(this.image, {this.fit = BoxFit.contain})
-      : assert(image != null),
+  Image(
+    this.image, {
+    this.fit = BoxFit.contain,
+    this.alignment = Alignment.center,
+    this.width,
+    this.height,
+  })  : assert(image != null),
         aspectRatio = image.height.toDouble() / image.width.toDouble();
         aspectRatio = image.height.toDouble() / image.width.toDouble();
 
 
   final PdfImage image;
   final PdfImage image;
@@ -29,6 +93,12 @@ class Image extends Widget {
 
 
   final BoxFit fit;
   final BoxFit fit;
 
 
+  final Alignment alignment;
+
+  final double width;
+
+  final double height;
+
   @override
   @override
   void layout(Context context, BoxConstraints constraints,
   void layout(Context context, BoxConstraints constraints,
       {bool parentUsesSize = false}) {
       {bool parentUsesSize = false}) {
@@ -50,7 +120,13 @@ class Image extends Widget {
   void paint(Context context) {
   void paint(Context context) {
     super.paint(context);
     super.paint(context);
 
 
-    context.canvas.drawImage(image, box.x, box.y, box.width, box.height);
+    _paintImage(
+      canvas: context.canvas,
+      image: image,
+      rect: box,
+      alignment: alignment,
+      fit: fit,
+    );
   }
   }
 }
 }
 
 

@@ -26,19 +26,20 @@ import 'package:pdf/widgets.dart';
 import 'package:test/test.dart';
 import 'package:test/test.dart';
 
 
 Document pdf;
 Document pdf;
+PdfImage image;
 
 
 void main() {
 void main() {
-  setUpAll(() {
+  setUpAll(() async {
     Document.debug = true;
     Document.debug = true;
     pdf = Document();
     pdf = Document();
-  });
 
 
-  test('Pdf Jpeg Download', () async {
-    final PdfImage image = PdfImage.jpeg(
+    image = PdfImage.jpeg(
       pdf.document,
       pdf.document,
       image: await download('https://www.nfet.net/nfet.jpg'),
       image: await download('https://www.nfet.net/nfet.jpg'),
     );
     );
+  });
 
 
+  test('Pdf Jpeg Download', () async {
     pdf.addPage(Page(
     pdf.addPage(Page(
       build: (Context context) => Center(child: Image(image)),
       build: (Context context) => Center(child: Image(image)),
     ));
     ));
@@ -64,6 +65,25 @@ void main() {
     );
     );
   });
   });
 
 
+  test('Pdf Image fit', () async {
+    pdf.addPage(
+      MultiPage(
+        build: (Context context) =>
+            List<Widget>.generate(BoxFit.values.length, (int index) {
+          final BoxFit fit = BoxFit.values[index];
+          return SizedBox(
+            width: 200,
+            height: 100,
+            child: Image(
+              image,
+              fit: fit,
+            ),
+          );
+        }),
+      ),
+    );
+  });
+
   tearDownAll(() {
   tearDownAll(() {
     final File file = File('jpeg.pdf');
     final File file = File('jpeg.pdf');
     file.writeAsBytesSync(pdf.save());
     file.writeAsBytesSync(pdf.save());