r19548 by craig - #8942: Fix dragging of guides

[scribus-commit]

Author: craig
Date: Thu Oct  2 21:30:25 2014
New Revision: 19548

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19548
Log:
#8942: Fix dragging of guides

Modified:
    trunk/Scribus/scribus/canvasgesture_rulermove.cpp
    trunk/Scribus/scribus/scribusview.cpp

Modified: trunk/Scribus/scribus/canvasgesture_rulermove.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19548&path=/trunk/Scribus/scribus/canvasgesture_rulermove.cpp
==============================================================================
--- trunk/Scribus/scribus/canvasgesture_rulermove.cpp (original)
+++ trunk/Scribus/scribus/canvasgesture_rulermove.cpp Thu Oct  2 21:30:25 2014
@@ -45,13 +45,9 @@
 	int page = -1;
 	if (!m_mousePoint.isNull())
 		page = m_doc->OnPage(m_mousePoint.x(), m_mousePoint.y());
-	//m_doc->OnPage(m_view->m_mousePointDoc.x(), m_view->m_mousePointDoc.y());
 	if (page == -1)
 		return;
-	qDebug()<<page;
-	ScPage* dragToPage;
-	//=m_doc->Pages->at(page);
-	dragToPage=m_doc->currentPage();
+	ScPage* dragToPage=m_doc->Pages->at(page);
 	if (!dragToPage)
 		return;
 	if (m_haveGuide)

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19548&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Thu Oct  2 21:30:25 2014
@@ -4090,7 +4090,6 @@
 	{
 		QMouseEvent* m = static_cast<QMouseEvent*> (event);
 		m_mousePointDoc=m_canvas->globalToCanvas(m->globalPos());
-		qDebug()<<"boo"<<m_mousePointDoc.x();
 		FPoint p = m_canvas->localToCanvas(QPoint(m->x(),m->y()));
 		emit MousePos(p.x(),p.y());
 		horizRuler->Draw(m->x() + qRound(Doc->minCanvasCoordinate.x() * m_canvas->scale())); //  - 2 * contentsX());