r14699 by fschmid - Fixed disappearing frame border when moving frames.

[scribus-commit]

Revision: 14699
Author: fschmid
Date: 2010-02-12T23:23:19.033496Z
Commit message: Fixed disappearing frame border when moving frames.

Changeset: 
M  /trunk/Scribus/scribus/canvas.cpp
M  /trunk/Scribus/scribus/scribusview.cpp

Diffs:
Index: scribus/canvas.cpp
===================================================================
--- scribus/canvas.cpp	(revision 14698)
+++ scribus/canvas.cpp	(revision 14699)
@@ -1648,6 +1648,7 @@
 			{
 				currItem->invalid = false;
 				currItem->DrawObj(painter, cullingArea);
+				currItem->DrawObj_Decoration(painter);
 			}
 			else
 			{
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp	(revision 14698)
+++ scribus/scribusview.cpp	(revision 14699)
@@ -4816,8 +4816,6 @@
 	return m_canvas->scale();
 }
 
-
-
 bool ScribusView::eventFilter(QObject *obj, QEvent *event)
 {
 //	if (obj == horizRuler || obj == vertRuler || obj == rulerMover)
@@ -4853,7 +4851,7 @@
 		m_canvasMode->mouseDoubleClickEvent(m);
 		return true;
 	}
-	else if (/* obj == widget() && */ event->type() == QEvent::KeyPress)
+	else if (event->type() == QEvent::KeyPress)
 	{
 		QKeyEvent* m = static_cast<QKeyEvent*> (event);
 		if (m_canvasMode->handleKeyEvents())
@@ -4862,7 +4860,7 @@
 			m_ScMW->keyPressEvent(m);
 		return true;
 	}
-	else if (/* obj == widget() && */ event->type() == QEvent::KeyRelease)
+	else if (event->type() == QEvent::KeyRelease)
 	{
 		QKeyEvent* m = static_cast<QKeyEvent*> (event);
 		if (m_canvasMode->handleKeyEvents())