r23142 by jghali - Remove BezierMode's MoveGX and MoveGY by noticing they are always false

scribus-commit scribus-commit at lists.scribus.net
Mon Aug 19 14:20:28 UTC 2019


Author: jghali
Date: Mon Aug 19 14:20:28 2019
New Revision: 23142

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23142
Log:
Remove BezierMode's MoveGX and MoveGY by noticing they are always false

Modified:
    trunk/Scribus/scribus/canvasmode_drawbezier.cpp
    trunk/Scribus/scribus/canvasmode_drawbezier.h

Modified: trunk/Scribus/scribus/canvasmode_drawbezier.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23142&path=/trunk/Scribus/scribus/canvasmode_drawbezier.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.cpp	(original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.cpp	Mon Aug 19 14:20:28 2019
@@ -63,7 +63,6 @@
 {
 	Mxp = Myp = -1;
 	SeRx = SeRy = -1;
-	MoveGX = MoveGY = false;
 	inItemCreation = false;
 	m_MouseButtonPressed = false;
 	FirstPoly = true;
@@ -123,7 +122,6 @@
 {
 //	qDebug() << "DrawBezierMode::activate" << flag;
 	Mxp = Myp = -1;
-	MoveGX = MoveGY = false;
 	inItemCreation = false;
 	FirstPoly = true;
 	setModeCursor();
@@ -247,21 +245,6 @@
 //	qDebug() << "legacy mode move:" << m->x() << m->y() << m_canvas->globalToCanvas(m->globalPos()).x() << m_canvas->globalToCanvas(m->globalPos()).y();
 //	emit MousePos(m->x()/m_canvas->scale(),// + m_doc->minCanvasCoordinate.x(), 
 //				  m->y()/m_canvas->scale()); // + m_doc->minCanvasCoordinate.y());
-/*	if (m_doc->guidesPrefs().guidesShown)
-	{
-		if (MoveGY)
-		{
-			m_view->FromHRuler(m);
-			return;
-		}
-		if (MoveGX)
-		{
-			m_view->FromVRuler(m);
-			return;
-		}
-	}
-*/
-	
 	if (commonMouseMove(m))
 		return;
 	
@@ -316,23 +299,16 @@
 	double Rxpd = 0;
 	double Rypd = 0;
 	PageItem *currItem;
-//	m_canvas->PaintSizeRect(QRect());
 	FPoint npf, npf2;
-//	QRect tx;
 	QTransform pm;
 	m_MouseButtonPressed = true;
 	m_view->HaveSelRect = false;
 	m_doc->DragP = false;
 	m_doc->leaveDrag = false;
-	MoveGX = MoveGY = false;
-//	inItemCreation = false;
-//	oldClip = 0;
 	m->accept();
 	m_view->registerMousePress(m->globalPos());
 	Mxp = mousePointDoc.x(); //qRound(m->x()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.x());
 	Myp = mousePointDoc.y(); //qRound(m->y()/m_canvas->scale() + 0*m_doc->minCanvasCoordinate.y());
-//	QRect mpo(m->x()-m_doc->guidesPrefs().grabRadius, m->y()-m_doc->guidesPrefs().grabRadius, m_doc->guidesPrefs().grabRadius*2, m_doc->guidesPrefs().grabRadius*2);
-//	mpo.moveBy(qRound(m_doc->minCanvasCoordinate.x() * m_canvas->scale()), qRound(m_doc->minCanvasCoordinate.y() * m_canvas->scale()));
 	Rxp = m_doc->ApplyGridF(FPoint(Mxp, Myp)).x();
 	Rxpd = Mxp - Rxp;
 	Mxp = qRound(Rxp);

Modified: trunk/Scribus/scribus/canvasmode_drawbezier.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23142&path=/trunk/Scribus/scribus/canvasmode_drawbezier.h
==============================================================================
--- trunk/Scribus/scribus/canvasmode_drawbezier.h	(original)
+++ trunk/Scribus/scribus/canvasmode_drawbezier.h	Mon Aug 19 14:20:28 2019
@@ -56,7 +56,6 @@
 	bool m_MouseButtonPressed;
 	double Mxp, Myp;
 	double SeRx, SeRy;
-	bool MoveGX, MoveGY;
 	FPointArray RecordP;
 };
 




More information about the scribus-commit mailing list