Changeset View
Changeset View
Standalone View
Standalone View
src/ksanewidget_p.cpp
Show First 20 Lines • Show All 709 Lines • ▼ Show 20 Line(s) | 671 | { | |||
---|---|---|---|---|---|
710 | if (ratio < 1) { | 710 | if (ratio < 1) { | ||
711 | x = SCALED_PREVIEW_MAX_SIDE; | 711 | x = SCALED_PREVIEW_MAX_SIDE; | ||
712 | y = (int)(SCALED_PREVIEW_MAX_SIDE / ratio); | 712 | y = (int)(SCALED_PREVIEW_MAX_SIDE / ratio); | ||
713 | } else { | 713 | } else { | ||
714 | y = SCALED_PREVIEW_MAX_SIDE; | 714 | y = SCALED_PREVIEW_MAX_SIDE; | ||
715 | x = (int)(SCALED_PREVIEW_MAX_SIDE / ratio); | 715 | x = (int)(SCALED_PREVIEW_MAX_SIDE / ratio); | ||
716 | } | 716 | } | ||
717 | 717 | | |||
718 | m_previewImg = QImage(x, y, QImage::Format_RGB32); | 718 | const qreal dpr = q->devicePixelRatioF(); | ||
719 | m_previewImg = QImage(QSize(x, y) * dpr, QImage::Format_RGB32); | ||||
720 | m_previewImg.setDevicePixelRatio(dpr); | ||||
719 | m_previewImg.fill(0xFFFFFFFF); | 721 | m_previewImg.fill(0xFFFFFFFF); | ||
720 | 722 | | |||
721 | // set the new image | 723 | // set the new image | ||
722 | m_previewViewer->setQImage(&m_previewImg); | 724 | m_previewViewer->setQImage(&m_previewImg); | ||
723 | } | 725 | } | ||
724 | 726 | | |||
725 | void KSaneWidgetPrivate::startPreviewScan() | 727 | void KSaneWidgetPrivate::startPreviewScan() | ||
726 | { | 728 | { | ||
▲ Show 20 Lines • Show All 133 Lines • ▼ Show 20 Line(s) | 839 | { | |||
860 | if (m_optResY != nullptr) { | 862 | if (m_optResY != nullptr) { | ||
861 | m_optResY->restoreSavedData(); | 863 | m_optResY->restoreSavedData(); | ||
862 | } | 864 | } | ||
863 | if (m_optPreview != nullptr) { | 865 | if (m_optPreview != nullptr) { | ||
864 | m_optPreview->restoreSavedData(); | 866 | m_optPreview->restoreSavedData(); | ||
865 | } | 867 | } | ||
866 | 868 | | |||
867 | m_previewViewer->setQImage(&m_previewImg); | 869 | m_previewViewer->setQImage(&m_previewImg); | ||
868 | m_previewViewer->zoom2Fit(); | 870 | m_previewViewer->zoom2Fit(); | ||
davidedmundson: I don't understand this bit.
What does m_previewImg's devicePixelRatio have to do with… | |||||
volkov: Ah, yes, it's needless, thanks. | |||||
869 | 871 | | |||
870 | if ((m_previewThread->saneStatus() != SANE_STATUS_GOOD) && | 872 | if ((m_previewThread->saneStatus() != SANE_STATUS_GOOD) && | ||
871 | (m_previewThread->saneStatus() != SANE_STATUS_EOF)) { | 873 | (m_previewThread->saneStatus() != SANE_STATUS_EOF)) { | ||
872 | alertUser(KSaneWidget::ErrorGeneral, i18n(sane_strstatus(m_previewThread->saneStatus()))); | 874 | alertUser(KSaneWidget::ErrorGeneral, i18n(sane_strstatus(m_previewThread->saneStatus()))); | ||
873 | } else if (m_autoSelect) { | 875 | } else if (m_autoSelect) { | ||
874 | m_previewViewer->findSelections(); | 876 | m_previewViewer->findSelections(); | ||
875 | } | 877 | } | ||
876 | 878 | | |||
▲ Show 20 Lines • Show All 300 Lines • Show Last 20 Lines |
I don't understand this bit.
What does m_previewImg's devicePixelRatio have to do with anything if we're only now about to create m_previewImg?
It looks more like this needs a fix in m_previewViewer