Author: jghali
Date: Wed Jan 16 22:31:20 2019
New Revision: 22808
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22808
Log:
Revert use of current page when zooming in or zooming out introduced by r22801
Modified:
trunk/Scribus/scribus/scribusview.cpp
Modified: trunk/Scribus/scribus/scribusview.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=22808&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Wed Jan 16 22:31:20 2019
@@ -2354,12 +2354,6 @@
zoomPointX = qRound(selRect.x() + selRect.width() /
2.0);
zoomPointY = qRound(selRect.y() + selRect.height() /
2.0);
}
- else if (Doc->currentPage() != nullptr)
- {
- ScPage* currentPage = Doc->currentPage();
- zoomPointX = qRound(currentPage->xOffset() +
currentPage->width() / 2.0);
- zoomPointY = qRound(currentPage->yOffset() +
currentPage->height() / 2.0);
- }
}
zoom(zoomPointX, zoomPointY, newScale, preservePoint);
}
@@ -2394,12 +2388,6 @@
QRectF selRect = Doc->m_Selection->getVisualGroupRect();
zoomPointX = qRound(selRect.x() + selRect.width() /
2.0);
zoomPointY = qRound(selRect.y() + selRect.height() /
2.0);
- }
- else if (Doc->currentPage() != nullptr)
- {
- ScPage* currentPage = Doc->currentPage();
- zoomPointX = qRound(currentPage->xOffset() +
currentPage->width() / 2.0);
- zoomPointY = qRound(currentPage->yOffset() +
currentPage->height() / 2.0);
}
}
zoom(zoomPointX, zoomPointY, newScale, preservePoint);
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
