Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle non-integer device pixel ratios in cover flow

Browse Source
This commit is contained in:
Kovid Goyal 2016-08-26 12:35:53 +05:30
parent 206a4d6535
commit 2948a6210d
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/calibre/gui2/pictureflow/pictureflow.cpp
View File

@ -1350,9 +1350,17 @@ void PictureFlow::keyPressEvent(QKeyEvent* event)
#define SPEED_LOWER_THRESHOLD 10 #define SPEED_LOWER_THRESHOLD 10
#define SPEED_UPPER_LIMIT 40 #define SPEED_UPPER_LIMIT 40
qreal PictureFlow::device_pixel_ratio() const {
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
return devicePixelRatioF();
#else
return (qreal)devicePixelRatio();
#endif
}
void PictureFlow::mouseMoveEvent(QMouseEvent* event) void PictureFlow::mouseMoveEvent(QMouseEvent* event)
{ {
int x = event->x() * devicePixelRatio(); int x = (int)(event->x() * device_pixel_ratio());
int distanceMovedSinceLastEvent = x - d->previousPos.x(); int distanceMovedSinceLastEvent = x - d->previousPos.x();
// Check to see if we need to switch from single press mode to a drag mode // Check to see if we need to switch from single press mode to a drag mode
@ -1433,14 +1441,14 @@ void PictureFlow::mouseMoveEvent(QMouseEvent* event)
} }
d->previousPos = event->pos() * devicePixelRatio(); d->previousPos = event->pos() * device_pixel_ratio();
d->previousPosTimestamp.restart(); d->previousPosTimestamp.restart();
} }
void PictureFlow::mousePressEvent(QMouseEvent* event) void PictureFlow::mousePressEvent(QMouseEvent* event)
{ {
d->firstPress = event->pos() * devicePixelRatio(); d->firstPress = event->pos() * device_pixel_ratio();
d->previousPos = event->pos() * devicePixelRatio(); d->previousPos = event->pos() * device_pixel_ratio();
d->previousPosTimestamp.start(); d->previousPosTimestamp.start();
d->singlePress = true; // Initially assume a single press d->singlePress = true; // Initially assume a single press
// d->dragStartSlide = d->getTarget(); // d->dragStartSlide = d->getTarget();
@ -1451,7 +1459,7 @@ void PictureFlow::mouseReleaseEvent(QMouseEvent* event)
{ {
bool accepted = false; bool accepted = false;
int sideWidth = (d->buffer.width() - slideSize().width()) /2; int sideWidth = (d->buffer.width() - slideSize().width()) /2;
int x = event->x() * devicePixelRatio(); int x = (int)(event->x() * device_pixel_ratio());
if (d->singlePress) if (d->singlePress)
{ {
@ -1478,15 +1486,15 @@ void PictureFlow::mouseReleaseEvent(QMouseEvent* event)
void PictureFlow::paintEvent(QPaintEvent* event) void PictureFlow::paintEvent(QPaintEvent* event)
{ {
Q_UNUSED(event); Q_UNUSED(event);
if (last_device_pixel_ratio != devicePixelRatio()) { if (last_device_pixel_ratio != device_pixel_ratio()) {
last_device_pixel_ratio = devicePixelRatio(); last_device_pixel_ratio = device_pixel_ratio();
d->resize(width() * last_device_pixel_ratio, height() * last_device_pixel_ratio); d->resize((int)(width() * last_device_pixel_ratio), (int)(height() * last_device_pixel_ratio));
update(); update();
return; return;
} }
QPainter painter(this); QPainter painter(this);
qreal dpr = d->buffer.devicePixelRatio(); qreal dpr = d->buffer.devicePixelRatio();
d->buffer.setDevicePixelRatio(devicePixelRatio()); d->buffer.setDevicePixelRatio(device_pixel_ratio());
painter.setRenderHint(QPainter::Antialiasing, false); painter.setRenderHint(QPainter::Antialiasing, false);
painter.drawImage(QPoint(0,0), d->buffer); painter.drawImage(QPoint(0,0), d->buffer);
d->buffer.setDevicePixelRatio(dpr); d->buffer.setDevicePixelRatio(dpr);
@ -1494,8 +1502,8 @@ void PictureFlow::paintEvent(QPaintEvent* event)
void PictureFlow::resizeEvent(QResizeEvent* event) void PictureFlow::resizeEvent(QResizeEvent* event)
{ {
last_device_pixel_ratio = devicePixelRatio(); last_device_pixel_ratio = device_pixel_ratio();
d->resize(width() * last_device_pixel_ratio, height() * last_device_pixel_ratio); d->resize((int)(width() * last_device_pixel_ratio), (int)(height() * last_device_pixel_ratio));
QWidget::resizeEvent(event); QWidget::resizeEvent(event);
} }

3
src/calibre/gui2/pictureflow/pictureflow.h
View File

@ -218,6 +218,7 @@ protected:
private: private:
PictureFlowPrivate* d; PictureFlowPrivate* d;
int last_device_pixel_ratio; qreal device_pixel_ratio() const;
qreal last_device_pixel_ratio;
}; };