Author: jghali
Date: Mon Apr 20 13:43:40 2020
New Revision: 23631
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23631
Log:
Code style fixes
Modified:
trunk/Scribus/scribus/pageitem.cpp
trunk/Scribus/scribus/scribusview.cpp
trunk/Scribus/scribus/scribusview.h
Modified: trunk/Scribus/scribus/pageitem.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23631&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Mon Apr 20 13:43:40 2020
@@ -8853,7 +8853,7 @@
{
double x,y,x2,y2;
getBoundingRect(&x, &y, &x2, &y2);
- return QRectF(x,y,x2-x,y2-y);
+ return QRectF(x, y, x2 - x, y2 - y);
}
QRectF PageItem::getCurrentBoundingRect(double moreSpace) const
Modified: trunk/Scribus/scribus/scribusview.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23631&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Mon Apr 20 13:43:40 2020
@@ -2182,7 +2182,7 @@
void ScribusView::reformPagesView()
{
if (!m_ScMW->scriptIsRunning())
- setContentsPos(qRound((m_doc->currentPage()->xOffset()-10 -
0*m_doc->minCanvasCoordinate.x()) * m_canvas->scale()),
qRound((m_doc->currentPage()->yOffset()-10 - 0*m_doc->minCanvasCoordinate.y())
* m_canvas->scale()));
+ setContentsPos(qRound((m_doc->currentPage()->xOffset() - 10 - 0
* m_doc->minCanvasCoordinate.x()) * m_canvas->scale()),
qRound((m_doc->currentPage()->yOffset() - 10 - 0 *
m_doc->minCanvasCoordinate.y()) * m_canvas->scale()));
if (!m_doc->isLoading())
{
setRulerPos(contentsX(), contentsY());
@@ -2212,7 +2212,7 @@
lowerRight.setX(qMax(0, lowerRight.x()+10));
lowerRight.setY(qMax(0, lowerRight.y()+10));
// qDebug() << "updateCanvas:" << upperLeft <<
lowerRight;
- m_canvas->update(upperLeft.x(), upperLeft.y(),
lowerRight.x()-upperLeft.x(), lowerRight.y()-upperLeft.y());
+ m_canvas->update(upperLeft.x(), upperLeft.y(), lowerRight.x() -
upperLeft.x(), lowerRight.y() - upperLeft.y());
}
else
{
Modified: trunk/Scribus/scribus/scribusview.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23631&path=/trunk/Scribus/scribus/scribusview.h
==============================================================================
--- trunk/Scribus/scribus/scribusview.h (original)
+++ trunk/Scribus/scribus/scribusview.h Mon Apr 20 13:43:40 2020
@@ -193,7 +193,7 @@
virtual void changed(QRectF re, bool);
void updateCanvas(QRectF box = QRectF());
- void updateCanvas(double x, double y, double width, double height) {
updateCanvas(QRectF(x,y,width,height)); }
+ void updateCanvas(double x, double y, double width, double height) {
updateCanvas(QRectF(x, y, width, height)); }
void setCanvasOrigin(double x, double y);
void setCanvasCenter(double x, double y);
FPoint canvasOrigin() const;
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
