fix page layout so that size is always correct
This commit is contained in:
@@ -117,14 +117,19 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
spacing: 0,
|
||||
children: [
|
||||
Stack(
|
||||
Expanded(
|
||||
child: Stack(
|
||||
children: [
|
||||
PdfPageView(
|
||||
key: ValueKey(page),
|
||||
document: document,
|
||||
pageNumber: page,
|
||||
maximumDpi: 300,
|
||||
alignment: twoPageMode
|
||||
? Alignment.centerRight
|
||||
: Alignment.center,
|
||||
),
|
||||
Positioned.fill(
|
||||
child: Container(
|
||||
@@ -135,8 +140,10 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
Visibility(
|
||||
visible: twoPageMode == true,
|
||||
child: Expanded(
|
||||
child: Stack(
|
||||
children: [
|
||||
PdfPageView(
|
||||
@@ -144,6 +151,7 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
|
||||
document: document,
|
||||
pageNumber: page + 1,
|
||||
maximumDpi: 300,
|
||||
alignment: Alignment.centerLeft,
|
||||
// alignment: Alignment.center,
|
||||
),
|
||||
Positioned.fill(
|
||||
@@ -156,6 +164,7 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
@@ -167,13 +176,21 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
|
||||
child: SizedBox.expand(
|
||||
child: LayoutBuilder(
|
||||
builder: (context, constraints) {
|
||||
final maxSize = Size(
|
||||
constraints.maxWidth,
|
||||
constraints.maxHeight,
|
||||
);
|
||||
final pageSizeUnscaled = document!.pages
|
||||
.elementAt(page)
|
||||
.size;
|
||||
final pageSizeScaled = calcScaledPageSize(
|
||||
maxSize,
|
||||
pageSizeUnscaled,
|
||||
);
|
||||
return DrawingBoard(
|
||||
background: SizedBox(
|
||||
width: calcScaledPageWidth(
|
||||
constraints.maxHeight,
|
||||
document!.pages.elementAt(page).size,
|
||||
),
|
||||
height: constraints.maxHeight,
|
||||
width: pageSizeScaled.width,
|
||||
height: pageSizeScaled.height,
|
||||
child: PdfPageView(
|
||||
document: document,
|
||||
pageNumber: page,
|
||||
@@ -250,7 +267,25 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
|
||||
);
|
||||
}
|
||||
|
||||
double calcScaledPageWidth(double parentHeight, Size pageSize) {
|
||||
return parentHeight * pageSize.width / pageSize.height;
|
||||
Size calcScaledPageSize(Size parentSize, Size pageSize) {
|
||||
// page restricted by height
|
||||
log.info("ParentSize: ${parentSize.width}, ${parentSize.height}");
|
||||
log.info("ParentSizeRatio: ${parentSize.aspectRatio}");
|
||||
log.info("PageSizeRatio: ${pageSize.aspectRatio}");
|
||||
if (parentSize.aspectRatio > pageSize.aspectRatio) {
|
||||
log.info("Restricted by height");
|
||||
final height = parentSize.height;
|
||||
final width = height * pageSize.aspectRatio;
|
||||
log.info("Size: $width, $height");
|
||||
return Size(width, height);
|
||||
}
|
||||
// page restricted by width
|
||||
else {
|
||||
log.info("Restricted by height");
|
||||
final width = parentSize.width;
|
||||
final height = width / pageSize.aspectRatio;
|
||||
log.info("Size: $width, $height");
|
||||
return Size(width, height);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user