From c7b364415b2da009f073d15ef1ad65add505dd64 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Thu, 30 May 2013 09:31:26 +0200 Subject: [PATCH] text is not selected on page load --- src/board/UBBoardView.cpp | 1 + src/domain/UBGraphicsTextItem.cpp | 9 ++++++++- src/domain/UBGraphicsTextItem.h | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 2f218a03..2aaada0d 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -1288,6 +1288,7 @@ void UBBoardView::mouseReleaseEvent (QMouseEvent *event) UBDrawingController::drawingController ()->setStylusTool (UBStylusTool::Selector); + textItem->setTextInteractionFlags(Qt::TextEditorInteraction); textItem->setSelected (true); textItem->setFocus(); } diff --git a/src/domain/UBGraphicsTextItem.cpp b/src/domain/UBGraphicsTextItem.cpp index c4d401b4..039a832d 100644 --- a/src/domain/UBGraphicsTextItem.cpp +++ b/src/domain/UBGraphicsTextItem.cpp @@ -89,6 +89,8 @@ QVariant UBGraphicsTextItem::itemChange(GraphicsItemChange change, const QVarian void UBGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { + setTextInteractionFlags(Qt::TextEditorInteraction); + // scene()->itemAt(pos) returns 0 if pos is not over text, but over text item, but mouse press comes. // It is a cludge... if (UBStylusTool::Play == UBDrawingController::drawingController()->stylusTool()) @@ -145,7 +147,6 @@ void UBGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event) if (mMultiClickState == 1) { -// setTextInteractionFlags(Qt::TextEditorInteraction); QGraphicsTextItem::mousePressEvent(event); setFocus(); } @@ -355,3 +356,9 @@ void UBGraphicsTextItem::documentSizeChanged(const QSizeF & newSize) { resize(newSize.width(), newSize.height()); } + +void UBGraphicsTextItem::setHtml(const QString &text) +{ + QGraphicsTextItem::setHtml(text); + setTextInteractionFlags(Qt::NoTextInteraction); +} diff --git a/src/domain/UBGraphicsTextItem.h b/src/domain/UBGraphicsTextItem.h index 06d4133b..637021e8 100644 --- a/src/domain/UBGraphicsTextItem.h +++ b/src/domain/UBGraphicsTextItem.h @@ -90,6 +90,7 @@ class UBGraphicsTextItem : public QGraphicsTextItem, public UBItem, public UBRes virtual void clearSource(){;} virtual void setUuid(const QUuid &pUuid); + void setHtml(const QString &text); signals: void textUndoCommandAdded(UBGraphicsTextItem *textItem); @@ -107,7 +108,6 @@ class UBGraphicsTextItem : public QGraphicsTextItem, public UBItem, public UBRes virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); - private: qreal mTextHeight; int mMultiClickState;