Skip to content

fix: use DevicePixel for print page rect under Qt6 #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 1 commit into from
Oct 20, 2026
+3 −3
Merged

fix: use DevicePixel for print page rect under Qt6 #671

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/widgets/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2721,7 +2721,7 @@ void Window::doPrint(DPrinter *printer, const QVector<int> &pageRange)
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QRectF pageRect(printer->pageRect());
#else
QRectF pageRect(printer->pageRect(QPrinter::Point));
QRectF pageRect(printer->pageRect(QPrinter::DevicePixel));
#endif

QRectF body = QRectF(0, 0, pageRect.width(), pageRect.height());
Expand Down Expand Up @@ -2827,7 +2827,7 @@ void Window::doPrintWithLargeDoc(DPrinter *printer, const QVector<int> &pageRang
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QRectF pageRect(printer->pageRect());
#else
QRectF pageRect(printer->pageRect(QPrinter::Point));
QRectF pageRect(printer->pageRect(QPrinter::DevicePixel));
#endif
QRectF body = QRectF(0, 0, pageRect.width(), pageRect.height());
// 使用首个文档信息即可
Expand Down Expand Up @@ -2923,7 +2923,7 @@ void Window::asynPrint(QPainter &p, DPrinter *printer, const QVector<int> &pageR
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QRectF pageRect(printer->pageRect());
#else
QRectF pageRect(printer->pageRect(QPrinter::Point));
QRectF pageRect(printer->pageRect(QPrinter::DevicePixel));
#endif
int dpiy = p.device()->logicalDpiY();
int margin = static_cast<int>((2 / 2.54) * dpiy); // 2 cm margins
Expand Down
Loading