Changeset View
Changeset View
Standalone View
Standalone View
libs/ui/canvas/kis_canvas_controller.cpp
| Context not available. | |||||
| 369 | if (!doc) return; | 369 | if (!doc) return; | ||
|---|---|---|---|---|---|
| 370 | 370 | | |||
| 371 | QRectF documentBounds = doc->documentBounds(); | 371 | QRectF documentBounds = doc->documentBounds(); | ||
| 372 | QRectF viewRect = m_d->coordinatesConverter->imageToWidget(documentBounds); | 372 | QRectF viewRect = m_d->coordinatesConverter->imageToDevice(documentBounds); | ||
| 373 | // QRectF viewRect = m_d->coordinatesConverter->imageToWidget(documentBounds) * m_d->view->devicePixelRatioF(); //* m_d->coordinatesConverter.; | ||||
| 373 | 374 | | |||
| 374 | // Cancel out any existing pan | 375 | // Cancel out any existing pan | ||
| 375 | const QRectF imageBounds = m_d->view->image()->bounds(); | 376 | const QRectF imageBounds = m_d->view->image()->bounds(); | ||
| 376 | const QRectF imageBB = m_d->coordinatesConverter->imageToWidget(imageBounds); | 377 | qDebug() << "imageBounds:" << imageBounds; | ||
| 378 | const QRectF imageBB = m_d->coordinatesConverter->imageToDevice(imageBounds); | ||||
| 379 | qDebug() << "imageBB:" << imageBounds; | ||||
| 377 | QPointF pan = imageBB.topLeft(); | 380 | QPointF pan = imageBB.topLeft(); | ||
| 378 | viewRect.translate(-pan); | 381 | viewRect.translate(-pan); | ||
| 379 | 382 | | |||
| 380 | int drawH = viewport()->height(); | 383 | int drawH = static_cast<int>(viewport()->height() * viewport()->devicePixelRatioF()); | ||
| 381 | int drawW = viewport()->width(); | 384 | int drawW = static_cast<int>(viewport()->width() * viewport() ->devicePixelRatioF()); | ||
| 382 | 385 | | |||
| 383 | qreal horizontalReserve = vastScrollingFactor() * drawW; | 386 | qreal horizontalReserve = vastScrollingFactor() * drawW; | ||
| 384 | qreal verticalReserve = vastScrollingFactor() * drawH; | 387 | qreal verticalReserve = vastScrollingFactor() * drawH; | ||
| Context not available. | |||||
| 389 | qreal xMax = viewRect.right() - drawW + horizontalReserve; | 392 | qreal xMax = viewRect.right() - drawW + horizontalReserve; | ||
| 390 | qreal yMax = viewRect.bottom() - drawH + verticalReserve; | 393 | qreal yMax = viewRect.bottom() - drawH + verticalReserve; | ||
| 391 | 394 | | |||
| 395 | qDebug() << "viewRect:" << viewRect | ||||
| 396 | << "drawH:" << drawH | ||||
| 397 | << "drawW:" << drawW | ||||
| 398 | << "horizontalReserve:" << horizontalReserve | ||||
| 399 | << "verticalReserve:" << verticalReserve | ||||
| 400 | << "xMin:" << xMin | ||||
| 401 | << "yMin:" << yMin | ||||
| 402 | << "xMax:" << xMax | ||||
| 403 | << "yMax:" << yMax; | ||||
| 404 | | ||||
| 392 | QScrollBar *hScroll = horizontalScrollBar(); | 405 | QScrollBar *hScroll = horizontalScrollBar(); | ||
| 393 | QScrollBar *vScroll = verticalScrollBar(); | 406 | QScrollBar *vScroll = verticalScrollBar(); | ||
| 394 | 407 | | |||
| Context not available. | |||||