r17999 by fschmid - Preview Mode: fixed item selection.

[scribus-commit]

Author: fschmid
Date: Fri Dec 28 09:58:54 2012
New Revision: 17999

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17999
Log:
Preview Mode: fixed item selection.

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

Modified: trunk/Scribus/scribus/canvas.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17999&path=/trunk/Scribus/scribus/canvas.cpp
==============================================================================
--- trunk/Scribus/scribus/canvas.cpp (original)
+++ trunk/Scribus/scribus/canvas.cpp Fri Dec 28 09:58:54 2012
@@ -477,7 +477,7 @@
 			--currNr;
 			continue;
 		}
-		if ((m_doc->drawAsPreview && !m_doc->editOnPreview) && !currItem->isAnnotation() && !allowInGroup)
+		if ((m_doc->drawAsPreview && !m_doc->editOnPreview) && !(currItem->isAnnotation() || currItem->isGroup()))
 		{
 			--currNr;
 			continue;
@@ -500,7 +500,12 @@
 					currItem->asGroupFrame()->adjustXYPosition();
 					PageItem* ret = itemInGroup(currItem, itemPos, mouseArea);
 					if (ret != NULL)
-						return ret;
+					{
+						if ((m_doc->drawAsPreview && !m_doc->editOnPreview) && !ret->isAnnotation())
+							return NULL;
+						else
+							return ret;
+					}
 				}
 				return currItem;
 			}

Modified: trunk/Scribus/scribus/scribusview.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17999&path=/trunk/Scribus/scribus/scribusview.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusview.cpp (original)
+++ trunk/Scribus/scribus/scribusview.cpp Fri Dec 28 09:58:54 2012
@@ -449,6 +449,7 @@
 {
 	Doc->editOnPreview = !Doc->editOnPreview;
 	m_ScMW->setPreviewToolbar();
+	DrawNew();
 }
 
 void ScribusView::togglePreview()