Author: craig
Date: Fri Feb 4 22:18:59 2022
New Revision: 24901
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24901
Log:
Build fix
Modified:
trunk/Scribus/scribus/canvasmode_rotate.cpp
trunk/Scribus/scribus/scpainter.cpp
trunk/Scribus/scribus/scpainter.h
Modified: trunk/Scribus/scribus/canvasmode_rotate.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24901&path=/trunk/Scribus/scribus/canvasmode_rotate.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_rotate.cpp (original)
+++ trunk/Scribus/scribus/canvasmode_rotate.cpp Fri Feb 4 22:18:59 2022
@@ -208,7 +208,7 @@
m_doc->leaveDrag = false;
m->accept();
m_view->registerMousePress(m->globalPos());
- QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius,
m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2,
m_doc->guidesPrefs().grabRadius*2);
+ QRect mpo(m->position().x()-m_doc->guidesPrefs().grabRadius,
m->position().y()-m_doc->guidesPrefs().grabRadius,
m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
double Rxp = m_doc->ApplyGridF(m_canvasPressCoord).x();
m_canvasPressCoord.setX( qRound(Rxp) );
double Ryp = m_doc->ApplyGridF(m_canvasPressCoord).y();
@@ -416,7 +416,7 @@
break;
QTransform p;
m_canvas->Transform(currItem, p);
- QRect mpo = QRect(m->x() -
m_doc->guidesPrefs().grabRadius, m->y() - m_doc->guidesPrefs().grabRadius,
m_doc->guidesPrefs().grabRadius * 2, m_doc->guidesPrefs().grabRadius * 2);
+ QRect mpo = QRect(m->position().x() -
m_doc->guidesPrefs().grabRadius, m->position().y() -
m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius * 2,
m_doc->guidesPrefs().grabRadius * 2);
if ((QRegion(p.map(QPolygon(QRect(-3, -3,
static_cast<int>(currItem->width() + 6), static_cast<int>(currItem->height() +
6))))).contains(mpo)))
{
QRect tx = p.mapRect(QRect(0, 0,
static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
Modified: trunk/Scribus/scribus/scpainter.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24901&path=/trunk/Scribus/scribus/scpainter.cpp
==============================================================================
--- trunk/Scribus/scribus/scpainter.cpp (original)
+++ trunk/Scribus/scribus/scpainter.cpp Fri Feb 4 22:18:59 2022
@@ -25,9 +25,7 @@
ScPainter::ScPainter(QImage *target, int w, int h, double transparency, int
blendmode)
: m_image(target),
m_layerTransparency(transparency),
- m_blendMode(blendmode),
- m_width(w),
- m_height(h)
+ m_blendMode(blendmode)
{
Q_ASSERT(w >= 0);
Q_ASSERT(h >= 0);
Modified: trunk/Scribus/scribus/scpainter.h
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24901&path=/trunk/Scribus/scribus/scpainter.h
==============================================================================
--- trunk/Scribus/scribus/scpainter.h (original)
+++ trunk/Scribus/scribus/scpainter.h Fri Feb 4 22:18:59 2022
@@ -180,15 +180,9 @@
int m_blendMode { 0 };
int m_blendModeFill { 0 };
int m_blendModeStroke { 0 };
-// unsigned int m_width;
-// unsigned int m_height;
QTransform m_matrix;
ScFace m_font;
double m_fontSize { 0.0 };
-// bool mf_underline { false };
-// bool mf_strikeout { false };
-// bool mf_shadow { false };
-// bool mf_outlined { false };
/*! \brief Filling */
QColor m_fill { 0, 0, 0 };
double m_fill_trans { 1.0 };
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
