r14816 by fschmid - Fixed incorrect display of the text edit ruler when moving images in frames.

[scribus-commit]

Revision: 14816
Author: fschmid
Date: 2010-02-25T10:08:19.171689Z
Commit message: Fixed incorrect display of the text edit ruler when moving images in frames.

Changeset: 
M  /trunk/Scribus/scribus/canvasmode_edit.cpp

Diffs:
Index: scribus/canvasmode_edit.cpp
===================================================================
--- scribus/canvasmode_edit.cpp	(revision 14815)
+++ scribus/canvasmode_edit.cpp	(revision 14816)
@@ -309,7 +309,8 @@
 	PageItem * it(0);
 	if(GetItem(&it))
 	{
-		m_canvas->setupEditHRuler(it, true);
+		if (it->asTextFrame())
+			m_canvas->setupEditHRuler(it, true);
 	}
 }
 
@@ -519,7 +520,7 @@
 //		m_view->slotDoCurs(false);
 		if (!currItem->locked() && !currItem->asLine())
 		{
-			FPoint canvasPoint = m_canvas->globalToCanvas(m->globalPos());
+			FPoint canvasPoint = m_canvas->globalToCanvas(m->globalPos());
 			if (m_canvas->frameHitTest(QPointF(canvasPoint.x(), canvasPoint.y()), currItem) < 0)
 			{
 				m_view->Deselect(true);