Fix for text items being selected on page load, and for non-editable

text items being editable on page load
8 years ago · c3e8e6397c
parent ee9965ac9e
commit c3e8e6397c
2 changed files with 4 additions and 1 deletions
--- 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);

--- 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);