ArsMasiuk#123, ArsMasiuk#124

src/qvge/CEditorScene.cpp

@@ -2113,11 +2113,10 @@ void CEditorScene::setSceneCursor(const QCursor& c)
 
 void CEditorScene::keyReleaseEvent(QKeyEvent *keyEvent)
 {
-	Super::keyReleaseEvent(keyEvent);
-
 	if (m_editController)
 	{
 		m_editController->onKeyReleased(*this, keyEvent);
+		updateCursorState();
 		return;
 	}
 
@@ -2127,18 +2126,15 @@ void CEditorScene::keyReleaseEvent(QKeyEvent *keyEvent)
 
 void CEditorScene::keyPressEvent(QKeyEvent *keyEvent)
 {
-	Super::keyPressEvent(keyEvent);
-
 	if (m_editController)
 	{
 		m_editController->onKeyPressed(*this, keyEvent);
+		updateCursorState();
 		return;
 	}
 
-
 	updateCursorState();
 
-
 	bool isCtrl = (keyEvent->modifiers() == Qt::ControlModifier);
 	bool isAlt = (keyEvent->modifiers() == Qt::AltModifier);
 	bool isShift = (keyEvent->modifiers() == Qt::ShiftModifier);

src/qvge/CEditorScene.h

@@ -354,8 +354,12 @@ protected Q_SLOTS:
 	QGraphicsItem *m_draggedItem = nullptr;
 	QSet<IInteractive*> m_acceptedHovers, m_rejectedHovers;
 	bool m_skipMenuEvent = false;
+
 	CItem *m_editItem = nullptr;
 
+	// pimpl
+	class CEditorScene_p* m_pimpl = nullptr;
+
 private:
 	int m_infoStatus;
 
@@ -391,9 +395,6 @@ protected Q_SLOTS:
 	bool m_labelsEnabled, m_labelsUpdate;
 
 	bool m_isFontAntialiased = true;
-
-	// pimpl
-	class CEditorScene_p* m_pimpl = nullptr;
 };
 
 

src/qvge/CNodeEditorScene.cpp

@@ -7,6 +7,7 @@
 #include "CPolyEdge.h"
 #include "CControlPoint.h"
 #include "CEditorSceneDefines.h"
+#include "CEditorScene_p.h"
 
 #include <qvgeio/CGraphBase.h>
 
@@ -468,6 +469,10 @@ bool CNodeEditorScene::startNewConnection(const QPointF& pos)
 
 void CNodeEditorScene::cancel(const QPointF& /*pos*/)
 {
+	// nothing to cancel
+	if (m_state == IS_None)
+		return;
+
 	// if not cancelling already
 	if (m_state != IS_Cancelling)
 	{
@@ -630,13 +635,34 @@ void CNodeEditorScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent)
 }
 
 
+void CNodeEditorScene::keyReleaseEvent(QKeyEvent *keyEvent)
+{
+	// forward scene events if in text editor mode
+	if (m_editItem)
+	{
+		bool done = m_pimpl->m_labelEditor.onKeyReleased(*this, keyEvent);
+		if (done)
+			updateCursorState();
+		return;
+	}
+
+	Super::keyReleaseEvent(keyEvent);
+}
+
+
 void CNodeEditorScene::keyPressEvent(QKeyEvent *keyEvent)
 {
+	// forward scene events if in text editor mode
+	if (m_editItem)
+	{
+		m_pimpl->m_labelEditor.onKeyPressed(*this, keyEvent);
+		return;
+	}
+
 	bool isCtrl = (keyEvent->modifiers() == Qt::ControlModifier);
 //	bool isAlt = (keyEvent->modifiers() == Qt::AltModifier);
 //	bool isShift = (keyEvent->modifiers() == Qt::ShiftModifier);
 
-
 	// Ctrl+Up/Down; alter node size by 10%
 	if (keyEvent->key() == Qt::Key_Up && isCtrl)
 	{

src/qvge/CNodeEditorScene.h

@@ -97,6 +97,7 @@ protected Q_SLOTS:
 	//virtual void mousePressEvent(QGraphicsSceneMouseEvent *mouseEvent);
 	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent);
 	virtual void keyPressEvent(QKeyEvent *keyEvent);
+	virtual void keyReleaseEvent(QKeyEvent *keyEvent);
 
 	virtual void onLeftButtonPressed(QGraphicsSceneMouseEvent *mouseEvent);
 	// called on drag after single click; returns true if handled

src/qvge/CTextLabelEdit.cpp

@@ -40,29 +40,26 @@ void CTextLabelEdit::updateGeometry()
 }
 
 
-bool CTextLabelEdit::sceneEvent(QEvent *event)
+bool CTextLabelEdit::onKeyPressed(CEditorScene& scene, QKeyEvent *keyEvent)
+{
+	return QGraphicsTextItem::sceneEvent(keyEvent);
+}
+
+
+bool CTextLabelEdit::onKeyReleased(CEditorScene& scene, QKeyEvent *keyEvent)
 {
-	//if (event->type() == QEvent::KeyPress)
-	//{
-	//	QKeyEvent *keyEvent = static_cast<QKeyEvent*> (event);
-	//	if ((keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter)
-	//		&& keyEvent->modifiers() == Qt::NoModifier)
-	//	{
-	//		finishEdit(true);
-	//		return true;
-	//	}
-	//}
-
-	if (event->type() == QEvent::KeyRelease)
+	if (keyEvent->matches(QKeySequence::Cancel))				// Esc
 	{
-		QKeyEvent *keyEvent = static_cast<QKeyEvent*> (event);
-		if (keyEvent->matches(QKeySequence::Cancel))				// Esc
-		{
-			finishEdit(true);
-			return true;
-		}
+		finishEdit(true);
+		return true;
 	}
 
+	return QGraphicsTextItem::sceneEvent(keyEvent);
+}
+
+
+bool CTextLabelEdit::sceneEvent(QEvent *event)
+{
 	if (event->type() == QEvent::FocusOut)
 	{
 		finishEdit(true);

src/qvge/CTextLabelEdit.h

@@ -12,6 +12,7 @@ It can be used freely, maintaining the information above.
 #include <QGraphicsTextItem> 
 
 class CItem;
+class CEditorScene;
 
 
 class CTextLabelEdit: public QGraphicsTextItem
@@ -25,6 +26,9 @@ class CTextLabelEdit: public QGraphicsTextItem
 	void startEdit(CItem *item);
 	void finishEdit(bool accept = true);
 
+	virtual bool onKeyPressed(CEditorScene& scene, QKeyEvent *keyEvent);
+	virtual bool onKeyReleased(CEditorScene& scene, QKeyEvent *keyEvent);
+
 Q_SIGNALS:
 	void editingStarted(CItem *item);
 	void editingFinished(CItem *item, bool cancelled);