fix page layout so that size is always correct

This commit is contained in:
2025-08-03 10:18:29 +02:00
parent 5e77f2d740
commit 2e72060087

View File

@@ -117,14 +117,19 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
spacing: 0,
children: [ children: [
Stack( Expanded(
child: Stack(
children: [ children: [
PdfPageView( PdfPageView(
key: ValueKey(page), key: ValueKey(page),
document: document, document: document,
pageNumber: page, pageNumber: page,
maximumDpi: 300, maximumDpi: 300,
alignment: twoPageMode
? Alignment.centerRight
: Alignment.center,
), ),
Positioned.fill( Positioned.fill(
child: Container( child: Container(
@@ -135,8 +140,10 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
), ),
], ],
), ),
),
Visibility( Visibility(
visible: twoPageMode == true, visible: twoPageMode == true,
child: Expanded(
child: Stack( child: Stack(
children: [ children: [
PdfPageView( PdfPageView(
@@ -144,6 +151,7 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
document: document, document: document,
pageNumber: page + 1, pageNumber: page + 1,
maximumDpi: 300, maximumDpi: 300,
alignment: Alignment.centerLeft,
// alignment: Alignment.center, // alignment: Alignment.center,
), ),
Positioned.fill( Positioned.fill(
@@ -156,6 +164,7 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
], ],
), ),
), ),
),
], ],
), ),
), ),
@@ -167,13 +176,21 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
child: SizedBox.expand( child: SizedBox.expand(
child: LayoutBuilder( child: LayoutBuilder(
builder: (context, constraints) { builder: (context, constraints) {
final maxSize = Size(
constraints.maxWidth,
constraints.maxHeight,
);
final pageSizeUnscaled = document!.pages
.elementAt(page)
.size;
final pageSizeScaled = calcScaledPageSize(
maxSize,
pageSizeUnscaled,
);
return DrawingBoard( return DrawingBoard(
background: SizedBox( background: SizedBox(
width: calcScaledPageWidth( width: pageSizeScaled.width,
constraints.maxHeight, height: pageSizeScaled.height,
document!.pages.elementAt(page).size,
),
height: constraints.maxHeight,
child: PdfPageView( child: PdfPageView(
document: document, document: document,
pageNumber: page, pageNumber: page,
@@ -250,7 +267,25 @@ class _SheetViewerPageState extends State<SheetViewerPage> {
); );
} }
double calcScaledPageWidth(double parentHeight, Size pageSize) { Size calcScaledPageSize(Size parentSize, Size pageSize) {
return parentHeight * pageSize.width / pageSize.height; // 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);
}
} }
} }