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

refactoring for making all the values related to zooming integers to avoid rounding errors, views should always use whole frame values

Browse Source
This commit is contained in:
Luis Ángel San Martín
2015-12-09 22:12:01 +01:00
parent 82b2153d9e
commit 84ea312b0e
6 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
YACReader/viewer.cpp
View File

@ -39,7 +39,7 @@ drag(false),
numScrollSteps(22),
shouldOpenNext(false),
shouldOpenPrevious(false),
zoom(1)
zoom(100)
{
translator = new YACReaderTranslator(this);
translator->hide();
@ -352,9 +352,9 @@ void Viewer::updateContentSize()
break;
}
if(zoom != 1)
if(zoom != 100)
{
pagefit.scale(pagefit.width()*zoom, 0, Qt::KeepAspectRatioByExpanding);
pagefit.scale(floor(pagefit.width()*zoom/100.0f), 0, Qt::KeepAspectRatioByExpanding);
}
//apply scaling
content->resize(pagefit);
@ -374,42 +374,38 @@ void Viewer::updateContentSize()
void Viewer::increaseZoomFactor()
{
zoom += 0.1;
if (zoom > 5)
{
zoom = 5;
}
zoom = std::min(zoom + 10, 500);
updateContentSize();
notificationsLabel->setText(QString::number(getZoomFactor()*100)+"%");
notificationsLabel->setText(QString::number(getZoomFactor())+"%");
notificationsLabel->flash();
emit zoomUpdated(zoom);
}
void Viewer::decreaseZoomFactor()
{
zoom -= 0.1;
if (zoom < 0.3)
zoom = 0.3;
zoom = std::max(zoom - 10, 30);
updateContentSize();
notificationsLabel->setText(QString::number(getZoomFactor()*100)+"%");
notificationsLabel->setText(QString::number(getZoomFactor())+"%");
notificationsLabel->flash();
emit zoomUpdated(zoom);
}
qreal Viewer::getZoomFactor()
int Viewer::getZoomFactor()
{
//this function is a placeholder for future refactoring work
return zoom;
}
void Viewer::setZoomFactor(qreal z)
void Viewer::setZoomFactor(int z)
{
//this function is mostly used to reset the zoom after a fitmode switch
if (z > 5)
zoom = 5;
else if (z < 0.1)
zoom = 0.1;
if (z > 500)
zoom = 500;
else if (z < 30)
zoom = 30;
else
zoom = z;
@ -935,7 +931,7 @@ void Viewer::mouseReleaseEvent ( QMouseEvent * event )
event->accept();
}
void Viewer::updateZoomRatio(float ratio)
void Viewer::updateZoomRatio(int ratio)
{
zoom = ratio;
updateContentSize();