mirrors/dfl
1
0
Fork 0
mirror of https://github.com/Rayerd/dfl.git synced 2025-04-25 20:49:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

The PrintPreviewDialog draws now the page to fill the entire window.

Browse source
This commit is contained in:
haru-s 2024-06-17 00:21:15 +09:00
parent 4a6c350d71
commit 93c976c123
1 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

40
source/dfl/printing.d
View file

@ -2041,6 +2041,7 @@ class PrintPreviewControl : Control
private int _startPage; ///
private bool _autoZoom; ///
private MemoryGraphics _offscreen; ///
private Size _justDrawnSize; ///
///
this(PrintDocument doc)
@ -2052,7 +2053,7 @@ class PrintPreviewControl : Control
{
_document = doc;
_columns = 1;
_rows = 0;
_rows = 1;
_startPage = 0;
_autoZoom = true;
}
@ -2117,6 +2118,12 @@ class PrintPreviewControl : Control
return _startPage;
}
///
private void justDrawnSize(Size sz) // setter
{
_justDrawnSize = sz;
}
///
final void invalidatePreview()
in
@ -2218,7 +2225,7 @@ class PrintPreviewControl : Control
{
if (this.autoZoom)
{
const Rect offscreenRect = Rect(0, 0, _offscreen.width, _offscreen.height);
const Rect offscreenRect = Rect(0, 0, _justDrawnSize.width, _justDrawnSize.height);
uint onscreenHeight = this.height;
uint onscreenWidth = offscreenRect.width * this.height / offscreenRect.height;
if (onscreenWidth >= this.width)
@ -2346,24 +2353,24 @@ class PrintPreviewDialog : Form
// Do nothing.
}
}
else if (e.button is _button2)
else if (e.button is _button2) // 1x1
{
_previewControl.rows = 1;
_previewControl.columns = 1;
_previewControl.invalidatePreview();
_previewControl.invalidate();
}
else if (e.button is _button3)
{
_previewControl.rows = 1;
_previewControl.columns = 2;
_previewControl.invalidatePreview();
_previewControl.invalidate();
}
else if (e.button is _button4)
else if (e.button is _button3) // 2x1
{
_previewControl.rows = 2;
_previewControl.columns = 2;
_previewControl.rows = 1;
_previewControl.invalidatePreview();
_previewControl.invalidate();
}
else if (e.button is _button4) // 2x2
{
_previewControl.columns = 2;
_previewControl.rows = 2;
_previewControl.invalidatePreview();
_previewControl.invalidate();
}
@ -2572,8 +2579,6 @@ class PreviewPrintController : PrintController
///
override void onEndPrint(PrintDocument document, PrintEventArgs e)
{
auto layoutHelper = new PageLayoutHelper(_previewControl.columns, _previewControl.rows);
const Rect screenRect = {
const int deviceWidth = GetSystemMetrics(SM_CXSCREEN); // pixel unit.
const int deviceHeight = GetSystemMetrics(SM_CYSCREEN); // pixel unit.
@ -2610,6 +2615,12 @@ class PreviewPrintController : PrintController
ratio = cast(double)(screenRect.width - LEFT_AND_RIGHT_MARGIN - HORIZONTAL_SPAN * (_previewControl.columns - 1)) / totalPageWidth;
}
_previewControl.justDrawnSize = Size(
cast(int)(totalPageWidth * ratio) + LEFT_AND_RIGHT_MARGIN + HORIZONTAL_SPAN * (_previewControl.columns - 1),
cast(int)(totalPageHeight * ratio) + TOP_AND_BOTTOM_MARGIN + VERTICAL_SPAN * (_previewControl.rows - 1)
);
auto layoutHelper = new PageLayoutHelper(_previewControl.columns, _previewControl.rows);
foreach (Page page; targetPageList)
{
const Point pos = layoutHelper.position();
@ -2632,7 +2643,6 @@ class PreviewPrintController : PrintController
SRCCOPY
);
pageGraphics.dispose(); // Created in onStartPage().
layoutHelper.appendPageSize(pageRenderWidth, pageRenderHeight);
}
}