Fix Scrollbar positionning and default margins

@@ -3,6 +3,8 @@
 ## 5.2.0
 ## 5.2.0
 
 
 - Improve Android page format detection [Deepak]
 - Improve Android page format detection [Deepak]
+- Add previewPageMargin and padding parameters [Deepak]
+- Fix Scrollbar positionning and default margins
 
 
 ## 5.1.0
 ## 5.1.0
 
 

@@ -115,7 +115,7 @@ class PdfPreview extends StatefulWidget {
 
 
   /// margin for the document preview page
   /// margin for the document preview page
   ///
   ///
-  /// defaults to [EdgeInsets.only(left: 8, top: 8, right: 8, bottom: 12,)],
+  /// defaults to [EdgeInsets.only(left: 20, top: 8, right: 20, bottom: 12)],
   final EdgeInsets? previewPageMargin;
   final EdgeInsets? previewPageMargin;
 
 
   /// padding for the pdf_preview widget
   /// padding for the pdf_preview widget
@@ -146,7 +146,9 @@ class _PdfPreviewState extends State<PdfPreview> {
 
 
   double? updatePosition;
   double? updatePosition;
 
 
-  final scrollController = ScrollController();
+  final scrollController = ScrollController(
+    keepScrollOffset: true,
+  );
 
 
   final transformationController = TransformationController();
   final transformationController = TransformationController();
 
 
@@ -355,8 +357,7 @@ class _PdfPreviewState extends State<PdfPreview> {
       return const Center(child: CircularProgressIndicator());
       return const Center(child: CircularProgressIndicator());
     }
     }
 
 
-    return Scrollbar(
-      child: ListView.builder(
+    return ListView.builder(
         controller: scrollController,
         controller: scrollController,
         padding: widget.padding,
         padding: widget.padding,
         itemCount: pages.length,
         itemCount: pages.length,
@@ -370,7 +371,6 @@ class _PdfPreviewState extends State<PdfPreview> {
           },
           },
           child: pages[index],
           child: pages[index],
         ),
         ),
-      ),
     );
     );
   }
   }
 
 
@@ -554,7 +554,10 @@ class _PdfPreviewState extends State<PdfPreview> {
     return Column(
     return Column(
       mainAxisAlignment: MainAxisAlignment.center,
       mainAxisAlignment: MainAxisAlignment.center,
       children: <Widget>[
       children: <Widget>[
-        Expanded(child: scrollView),
+        Expanded(
+            child: scrollController.hasClients
+                ? Scrollbar(controller: scrollController, child: scrollView)
+                : scrollView),
         if (actions.isNotEmpty && widget.useActions)
         if (actions.isNotEmpty && widget.useActions)
           Material(
           Material(
             elevation: 4,
             elevation: 4,
@@ -568,6 +571,7 @@ class _PdfPreviewState extends State<PdfPreview> {
                 ),
                 ),
               ),
               ),
             ),
             ),
+            ),
           )
           )
       ],
       ],
     );
     );
@@ -643,13 +647,18 @@ class _PdfPreviewPage extends StatelessWidget {
   @override
   @override
   Widget build(BuildContext context) {
   Widget build(BuildContext context) {
     final im = PdfRasterImage(page!);
     final im = PdfRasterImage(page!);
+    final scrollbarTrack = Theme.of(context)
+            .scrollbarTheme
+            .thickness
+            ?.resolve({MaterialState.hovered}) ??
+        12;
 
 
     return Container(
     return Container(
       margin: pageMargin ??
       margin: pageMargin ??
-          const EdgeInsets.only(
-            left: 8,
+          EdgeInsets.only(
+            left: 8 + scrollbarTrack,
             top: 8,
             top: 8,
-            right: 8,
+            right: 8 + scrollbarTrack,
             bottom: 12,
             bottom: 12,
           ),
           ),
       decoration: pdfPreviewPageDecoration ??
       decoration: pdfPreviewPageDecoration ??