mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix double page mode composing regression

Browse Source
This commit is contained in:
Felix Kauselmann 2014-11-02 20:41:06 +01:00
parent 810920c471
commit d1c3969dde
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
YACReader/render.cpp
View File

@ -552,36 +552,54 @@ QPixmap * Render::getCurrentDoubleMangaPage()
{ {
QPoint leftpage(0,0); QPoint leftpage(0,0);
QPoint rightpage(0,0); QPoint rightpage(0,0);
QSize leftsize;
QSize rightsize;
int totalWidth,totalHeight; int totalWidth,totalHeight;
switch (imageRotation) switch (imageRotation)
{ {
case 0: case 0:
totalHeight = qMax(buffer[currentPageBufferedIndex]->height(), buffer[currentPageBufferedIndex+1]->height()); totalHeight = qMax(buffer[currentPageBufferedIndex]->height(), buffer[currentPageBufferedIndex+1]->height());
totalWidth = buffer[currentPageBufferedIndex]->width() + buffer[currentPageBufferedIndex+1]->width(); leftsize.setHeight(totalHeight);
rightpage.setX(buffer[currentPageBufferedIndex+1]->width()); rightsize.setHeight(totalHeight);
leftsize.setWidth(buffer[currentPageBufferedIndex+1]->width() + (totalHeight - buffer[currentPageBufferedIndex+1]->height()));
rightsize.setWidth(buffer[currentPageBufferedIndex]->width() + (totalHeight - buffer[currentPageBufferedIndex]->height()));
totalWidth = leftsize.rwidth() + rightsize.rwidth();
rightpage.setX(leftsize.rwidth());
break; break;
case 90: case 90:
totalWidth = qMax(buffer[currentPageBufferedIndex]->width(), buffer[currentPageBufferedIndex+1]->width()); totalWidth = qMax(buffer[currentPageBufferedIndex]->width(), buffer[currentPageBufferedIndex+1]->width());
totalHeight = buffer[currentPageBufferedIndex]->height() + buffer[currentPageBufferedIndex+1]->height(); leftsize.setWidth(totalWidth);
rightpage.setY(buffer[currentPageBufferedIndex+1]->height()); rightsize.setWidth(totalWidth);
leftsize.setHeight(buffer[currentPageBufferedIndex+1]->height() + (totalWidth - buffer[currentPageBufferedIndex+1]->width()));
rightsize.setHeight(buffer[currentPageBufferedIndex]->height() + (totalWidth - buffer[currentPageBufferedIndex]->width()));
totalHeight = leftsize.rheight() + rightsize.rheight();
rightpage.setY(leftsize.rheight());
break; break;
case 180: case 180:
totalHeight = qMax(buffer[currentPageBufferedIndex]->height(), buffer[currentPageBufferedIndex+1]->height()); totalHeight = qMax(buffer[currentPageBufferedIndex]->height(), buffer[currentPageBufferedIndex+1]->height());
totalWidth = buffer[currentPageBufferedIndex]->width() + buffer[currentPageBufferedIndex+1]->width(); leftsize.setHeight(totalHeight);
leftpage.setX(buffer[currentPageBufferedIndex]->width()); rightsize.setHeight(totalHeight);
leftsize.setWidth(buffer[currentPageBufferedIndex+1]->width() + (totalHeight - buffer[currentPageBufferedIndex+1]->height()));
rightsize.setWidth(buffer[currentPageBufferedIndex]->width() + (totalHeight - buffer[currentPageBufferedIndex]->height()));
totalWidth = leftsize.rwidth() + rightsize.rwidth();
leftpage.setX(rightsize.rwidth());
break; break;
case 270: case 270:
totalWidth = qMax(buffer[currentPageBufferedIndex]->width(), buffer[currentPageBufferedIndex+1]->width()); totalWidth = qMax(buffer[currentPageBufferedIndex]->width(), buffer[currentPageBufferedIndex+1]->width());
totalHeight = buffer[currentPageBufferedIndex]->height() + buffer[currentPageBufferedIndex+1]->height(); leftsize.setWidth(totalWidth);
leftpage.setY(buffer[currentPageBufferedIndex]->height()); rightsize.setWidth(totalWidth);
leftsize.setHeight(buffer[currentPageBufferedIndex+1]->height() + (totalWidth - buffer[currentPageBufferedIndex+1]->width()));
rightsize.setHeight(buffer[currentPageBufferedIndex]->height() + (totalWidth - buffer[currentPageBufferedIndex]->width()));
totalHeight = leftsize.rheight() + rightsize.rheight();
leftpage.setY(rightsize.rheight());
break; break;
default: default:
return NULL; return NULL;
} }
QPixmap * page = new QPixmap(totalWidth, totalHeight); QPixmap * page = new QPixmap(totalWidth, totalHeight);
QPainter painter(page); QPainter painter(page);
painter.drawImage(rightpage, *buffer[currentPageBufferedIndex]); painter.drawImage(QRect(rightpage, rightsize), *buffer[currentPageBufferedIndex]);
painter.drawImage(leftpage, *buffer[currentPageBufferedIndex+1]); painter.drawImage(QRect(leftpage, leftsize), *buffer[currentPageBufferedIndex+1]);
return page; return page;
} }
else else