r24441 by jghali - #16457: Pressing ENTER in PP adds a paragraph separator in text frame

[scribus-commit]

Author: jghali
Date: Mon Feb  1 22:32:29 2021
New Revision: 24441

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24441
Log:
#16457: Pressing ENTER in PP adds a paragraph separator in text frame

Modified:
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24441&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp	(original)
+++ trunk/Scribus/scribus/scribus.cpp	Mon Feb  1 22:32:29 2021
@@ -1760,7 +1760,7 @@
 //AV -> CanvasMode
 void ScribusMainWindow::keyPressEvent(QKeyEvent *k)
 {
-	if (HaveDoc && view)
+	if (HaveDoc && view && (view->hasFocus() || view->widget()->hasFocus()))
 	{
 		view->canvasMode()->keyPressEvent(k);
 		return;
@@ -1771,7 +1771,7 @@
 
 void ScribusMainWindow::keyReleaseEvent(QKeyEvent *k)
 {
-	if (HaveDoc && view)
+	if (HaveDoc && view && (view->hasFocus() || view->widget()->hasFocus()))
 	{
 		view->canvasMode()->keyReleaseEvent(k);
 		return;