From c3e8e6397c3c39f5a432599a70129cbc3c3412ea Mon Sep 17 00:00:00 2001
From: Craig Watson <craig@watsons.ch>
Date: Sat, 10 Sep 2016 14:35:41 -0400
Subject: [PATCH] Fix for text items being selected on page load, and for
 non-editable text items being editable on page load

---
 src/adaptors/UBSvgSubsetAdaptor.cpp | 1 +
 src/domain/UBGraphicsTextItem.cpp   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp
index e44eba15..93dc16b6 100644
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@@ -854,6 +854,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene(UBDocumentProx
                     {
                         textItem->setFlag(QGraphicsItem::ItemIsMovable, true);
                         textItem->setFlag(QGraphicsItem::ItemIsSelectable, true);
+                        textItem->activateTextEditor(false);
 
                         mScene->addItem(textItem);
 
diff --git a/src/domain/UBGraphicsTextItem.cpp b/src/domain/UBGraphicsTextItem.cpp
index 6785a563..e48cbb5b 100644
--- a/src/domain/UBGraphicsTextItem.cpp
+++ b/src/domain/UBGraphicsTextItem.cpp
@@ -134,8 +134,10 @@ void UBGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
         }
     }
 
-    if (!data(UBGraphicsItemData::ItemEditable).toBool())
+    if (!data(UBGraphicsItemData::ItemEditable).toBool()) {
+        setTextInteractionFlags(Qt::NoTextInteraction);
         return;
+    }
 
     setTextInteractionFlags(Qt::TextEditorInteraction);