FCL/sf/mw/hb: comparison src/hbwidgets/editors/hbabstractedit.cpp

equal deleted inserted replaced

-:7516d6d86cf5
+:ed14f46c0e55
 #include "hbmenu.h"
 #include "hbaction.h"
 #include "hbselectioncontrol_p.h"
 #include "hbsmileyengine_p.h"
 #include "hbinputeditorinterface.h"
-#include "hbfeaturemanager_r.h"
+#ifdef HB_TEXT_MEASUREMENT_UTILITY
-#include "hbtextmeasurementutility_p.h"
+#include "hbtextmeasurementutility_r.h"
-#include "hbtapgesture.h"
+#include "hbtextmeasurementutility_r_p.h"
-#include "hbpangesture.h"
+#endif
-#include "hbnamespace_p.h"
 #include <QApplication>
 #include "hbpopup.h"
 #include "hbformatdialog.h"
 #include <QTextList>
 \li Editor content:  Both rich text and plain text are supported in HbAbstractEdit. Depending on the actual
 editor widget only one or the other type might be supported. Plain text content is set with
 method \ref setPlainText. Method \ref toPlainText returns the content converted to plain text.
-\li Focus control: Editor is responsble for controlling the input panel visibility. In some situations special editor may need to also handle this, but in general it is always handled by HbAbstractEdit.
+\li Focus control: Editor is responsble for controlling the input panel visibility. In some situations special editor may need to also handle this,
-Input panel is closed when editor loses focus.
+but in general it is always handled by HbAbstractEdit. Input panel is closed when editor loses focus.
+However when setting the editor focus programmatically with setFocus() it is the responsibility of client to control the visibility of input panel.
 \li Cursor control: A convenience method \ref moveCursor can also be used to move the cursor.
 \li Scrolling: When e.g. the size of the content exceeds the size of editor, method \ref setScrollable
 can be used to make the editor scrollable. Method isScrollable tells whether the editor is scrollable or not.
 \li Input validation: The validator for restricting the content input is set with method \ref setValidator. Only \ref HbValidator
 based validators can be used.
 \section composition Widget composition
-Editor widget consists of these sub-items visible in the picture.
+The size of the canvas is always same as the size of the document, and the width of the scroll area is same as the width of the document.
-In this example editor shows only one visible line of the content.
-\image html editor_composition.jpg
-The size of the canvas is always same as the size of the document, and the width of the scroll area
-is same as the width of the document. The editor margins are defined in the CSS.
 */
 /*!
 \fn void HbAbstractEdit::contentsChanged()
 \sa QTextDocument::toPlainText()
 */
 #define Hb_Invalid_Position QPointF(-1.0, -1.0)
 /*!
 Constructs a HbAbstractEdit with parent \a parent.
 */
 HbAbstractEdit::HbAbstractEdit(QGraphicsItem *parent) :
 QTextCursor matchCursor(document());
 matchCursor.setPosition(oldPos);
 d->smileyEngineInstance()->insertSmiley(matchCursor);
 d->cursorChanged(HbValidator::CursorChangeFromContentUpdate);
+} else if (p == "Magnifier") {
+QString param = property("Magnifier").toString();
+if (param == "Enabled") {
+d->enableMagnifier = true;
+} else if (param == "Disabled") {
+d->enableMagnifier = false;
+}
+if (d->selectionControl) {
+d->selectionControl->setMagnifierEnabled(d->enableMagnifier);
+}
 }
 } else { //HbEvent handler
 if (event->type() == HbEvent::InputMethodFocusIn) {
 d->setInputFocusEnabled(true);
 || e->replacementLength() > 0;
 d->cursor.beginEditBlock();
 if (isGettingInput) {
+if (d->selectionControl) {
+d->selectionControl->hideHandles();
+d->updateCursorType();
+}
 if (!d->imEditInProgress) {
 d->imEditInProgress = true;
 d->imPosition = d->selectionCursor.selectionStart();
 d->imRemoved = d->selectionCursor.selectionEnd() - d->selectionCursor.selectionStart();
 }
 d->imAdded = e->commitString().length();
 d->imRemoved =  e->replacementLength();
 d->_q_contentsChanged();
 }
-if(d->hasInputFocus()) {
-d->cursorOn = true;
-}
 d->ensureCursorVisible();
+d->canvas->setPreferredSize(d->calculatePreferredDocSize());
 }
 /*!
 \reimp
 */
 void HbAbstractEdit::keyPressEvent(QKeyEvent *event)
 {
 Q_D(HbAbstractEdit);
-if (d->interactionFlags & Qt::NoTextInteraction)
+if (d->selectionControl) {
-return;
+d->selectionControl->hideHandles();
+d->updateCursorType();
+}
 #ifndef QT_NO_SHORTCUT
 #ifndef QT_NO_CLIPBOARD
 if (event == QKeySequence::Copy) {
 event->accept();
 Q_D(HbAbstractEdit);
 HbWidget::focusInEvent(event);
 d->selectionControl = HbSelectionControl::attachEditor(this);
+d->selectionControl->setMagnifierEnabled(isSelectionControlEnabled()&&d->enableMagnifier);
-if (d->interactionFlags & Qt::NoTextInteraction)
-return;
 // It sets the cursor the focus item's depending on if
 // the input panel is connceted or not
 d->setInputFocusEnabled(d->hasInputFocus());
 void HbAbstractEdit::focusOutEvent(QFocusEvent *event)
 {
 HbWidget::focusOutEvent(event);
 Q_D(HbAbstractEdit);
-if (d->interactionFlags & Qt::NoTextInteraction)
-return;
 // It sets the cursor the focus item's depending on if
 // the input panel is connceted or not
 d->setInputFocusEnabled(d->hasInputFocus());
 \deprecated HbAbstractEdit::primitive(HbStyle::Primitive)
 is deprecated.
 Returns pointer to a \a primitive of HbAbstractEdit.
-Available primitive is HbStyle::P_Edit_text.
+Available primitive is HbStylePrivate::P_Edit_text.
 \reimp
 \sa HbStyle::Primitive, HbWidget::primitive()
 */
 QGraphicsItem *HbAbstractEdit::primitive (HbStyle::Primitive primitive) const
 {
 Q_D(const HbAbstractEdit);
+const HbStylePrivate::Primitive p = (HbStylePrivate::Primitive)primitive;
-if (primitive == HbStyle::P_Edit_text) {
+if (p == HbStylePrivate::P_Edit_text) {
 return d->scrollArea;
 } else {
 return HbWidget::primitive(primitive);
 }
 }
 if(d->scrollArea) {
 canvasGeom.setHeight(qMax(d->scrollArea->size().height(), d->doc->size().height()));
 }
 d->canvas->setGeometry(canvasGeom);
+d->canvas->setPreferredSize(d->calculatePreferredDocSize());
 d->ensureCursorVisible();
 if (d->selectionControl) {
 d->selectionControl->updatePrimitives();
 }
 void HbAbstractEdit::timerEvent(QTimerEvent *e)
 {
 Q_D(HbAbstractEdit);
 if (e->timerId() == d->cursorBlinkTimer.timerId()) {
 d->cursorOn = !d->cursorOn;
-if (d->cursor.hasSelection())
-d->cursorOn &= (QApplication::style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected) != 0);
 d->repaintCursor();
+} else if (e->timerId() == d->doubleTapTimer.timerId()) {
+d->doubleTapTimer.stop();
+if (d->tapCounter == 1 && d->showContextMenu && contextMenuFlags().testFlag(Hb::ShowTextContextMenuOnSelectionClicked)) {
+showContextMenu(mapToScene(d->tapPosition));
+}
+d->tapCounter = 0;
 }
 }
 /*!
 This is a slot for listening a signal with a same name from QTextDocument.
 {
 #ifndef QT_NO_CLIPBOARD
 Q_D(HbAbstractEdit);
 if (!(d->interactionFlags & Qt::TextEditable) || !d->cursor.hasSelection())
 return;
 copy();
 d->cursor.removeSelectedText();
+d->cursorChanged(HbValidator::CursorChangeFromContentUpdate);
 #endif//QT_NO_CLIPBOARD
 }
 /*!
 Adds content which is currently selected in editor to clipboard.
 d->prepDocForPaste();
 const QMimeData *md = QApplication::clipboard()->mimeData();
 if (md) {
 insertFromMimeData(md);
 }
-}
+d->cursorChanged(HbValidator::CursorChangeFromContentUpdate);
+}
 #endif//QT_NO_CLIPBOARD
 }
 /*!
 Selects the word under the cursor in the editor.
 int cursorPos = d->hitTest(d->tapPosition, Qt::FuzzyHit);
 if (cursorPos == -1)
 return;
-setCursorPosition(cursorPos);
+d->cursor.setPosition(cursorPos);
 d->cursor.select(QTextCursor::WordUnderCursor);
 d->cursorChanged(HbValidator::CursorChangeFromMouse);
 }
 /*!
 QRectF rect  = d->rectForPositionInCanvasCoords(position, edge);
 rect = mapRectFromItem(d->canvas,rect);
 return rect;
 }
 /*!
 Returns the contents as plain text. If smiley recognition is enabled
 all the smiley images will be replaced by their textual representations.
 \sa QTextDocument::toPlainText() setSmileysEnabled()
 void HbAbstractEdit::setValidator(HbValidator* validator)
 {
 Q_D(HbAbstractEdit);
 d->validator = validator;
-d->initValidator();
+if (d->validator) {
+d->initValidator();
+}
 }
 /*!
 \property QLineEdit::acceptableInput
 This property holds whether the input satisfies the validator.
 void HbAbstractEdit::drawContents(QPainter *painter, const QStyleOptionGraphicsItem &option)
 {
 Q_D(HbAbstractEdit);
 #ifdef HB_DEBUG_EDITOR_DRAW_RECTS
 painter->setPen(Qt::green);
-/*for(QTextBlock tb = d->doc->begin(); tb.isValid(); tb=tb.next()) {
+/*
-painter->drawRect(blockBoundingRect(tb));
+for(QTextBlock tb = d->doc->begin(); tb.isValid(); tb=tb.next()) {
+painter->drawRect(blockBoundingRect(tb));
+// Draw lines
+const QPointF layoutPos = blockBoundingRect(tb).topLeft();
+painter->setPen(Qt::red);
+const QTextLayout *layout = tb.layout();
+for(int i = 0;i < layout->lineCount();i++) {
+QTextLine line = layout->lineAt(i);
+// Draw descent rect
+QRectF rect = QRectF(layoutPos.x() + line.x(),
+layoutPos.y() + line.y() + line.ascent(),
+line.width(),line.descent()+1);
+painter->drawRect(rect);
+}
 }*/
 painter->drawRect(d->doc->documentLayout()->frameBoundingRect(
 d->doc->rootFrame()).adjusted(2,2,-2,-2));
 painter->setOpacity(0.3);
 painter->setPen(Qt::blue);
 QRectF viewRect = d->viewPortRect();
 QRectF intersected = option.exposedRect.intersected(mapRectToItem(d->canvas, viewRect));
 QAbstractTextDocumentLayout::PaintContext ctx = d->getPaintContext();
-// Save painter state that will be modified
-QRegion clipRegion = painter->clipRegion();
 if (option.exposedRect.isValid()){
 painter->setClipRect(intersected, Qt::IntersectClip);
 }
 ctx.clip = intersected;
+// Disable drawing of Qt cursor and save old cursor position
+int oldCursorPosition = ctx.cursorPosition;
+ctx.cursorPosition = -1;
 d->drawContentBackground(painter, option);
 if(document()->isEmpty() && d->placeholderDoc && !d->placeholderDoc->isEmpty()) {
 QTextBlock block = d->cursor.block();
 QTextLayout *layout = block.layout();
 if(!layout->preeditAreaText().length()) {
 QColor textColor(ctx.palette.color(QPalette::Text));
 QColor hintText(ctx.palette.color(QPalette::NoRole));
-int cursorPos = ctx.cursorPosition;
-ctx.cursorPosition = -1;
 ctx.palette.setColor(QPalette::Text, hintText);
 d->placeholderDoc->documentLayout()->draw(painter, ctx);
 ctx.palette.setColor(QPalette::Text, textColor);
-ctx.cursorPosition = cursorPos;
 }
 }
 document()->documentLayout()->draw(painter, ctx);
-// Draw the pins for the selection handle
+ctx.cursorPosition = oldCursorPosition;
-d->drawSelectionEdges(painter, ctx);
+d->drawCursor(painter, ctx);
 #ifdef HB_DEBUG_EDITOR_HANDLES
 QRectF a = rectForPosition(d->cursor.anchor());
 QRectF c = rectForPosition(d->cursor.position());
 painter->setPen(Qt::green);
 painter->drawRect(c);
 painter->setPen(Qt::red);
 painter->drawRect(d->cursorRect());
 #endif
-// Restore state
-painter->setClipRegion(clipRegion);
 }
 /*!
 Returns the used scroll area if edit is set as scrollable;
 otherwise returns null pointer.
 menu = new HbMenu();
 }
 if (d->cursor.hasSelection() && d->canCut()) {
 connect(
-menu->addAction(hbTrId("txt_common_menu_cut")), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_cut")), SIGNAL(triggered()), this, SLOT(cut()));
-this, SLOT(cut()));
 }
 if (d->cursor.hasSelection() && d->canCopy()) {
 connect(
-menu->addAction(hbTrId("txt_common_menu_copy")), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_copy")), SIGNAL(triggered()), this, SLOT(copy()));
-this, SLOT(copy()));
 }
 if (!d->cursor.hasSelection() && !d->doc->isEmpty() && d->canCopy()){
 connect(
-menu->addAction(hbTrId("txt_common_menu_select")), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_select_all_contents")), SIGNAL(triggered()), this, SLOT(selectAll()));
-this, SLOT(selectClickedWord()));
-connect(
-menu->addAction(hbTrId("txt_common_menu_select_all_contents")), SIGNAL(triggered()),
-this, SLOT(selectAll()));
 }
 if (d->canPaste()) {
 connect(
-menu->addAction(hbTrId("txt_common_menu_paste")), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_paste")), SIGNAL(triggered()), this, SLOT(paste()));
-this, SLOT(paste()));
 }
 if (d->cursor.hasSelection()) {
 connect(
-menu->addAction(hbTrId("txt_common_menu_deselect")), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_deselect")), SIGNAL(triggered()), this, SLOT(deselect()));
-this, SLOT(deselect()));
 }
 if (d->canFormat()) {
 connect(
-menu->addAction(hbTrId("txt_common_menu_format")), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_format")), SIGNAL(triggered()), this, SLOT(format()));
-this, SLOT(format()));
 }
 emit aboutToShowContextMenu(menu, d->tapPosition);
 if(menu->actions().count() > 0){
-//        d->minimizeInputPanel();
 menu->setPreferredPos(position);
 menu->show();
 }
+d->showContextMenu = false;
 }
 /*!
 Returns the validator currently in use.
 {
 return document()->defaultTextOption().alignment();
 }
 /*!
-Returns current flags describing on which events context menu is shown
+Returns current flags describing on which events context menu is shown.
+The default value is both Hb::ShowTextContextMenuOnSelectionClicked and Hb::ShowTextContextMenuOnLongPress are set.
 \sa Hb::TextContextMenuFlag
 */
 Hb::TextContextMenuFlags HbAbstractEdit::contextMenuFlags() const
 {
 Q_D(const HbAbstractEdit);
 return d->contextMenuShownOn;
 }
 /*!
-Sets \a flags describing on which events context menu is shown
+Sets \a flags describing on which events context menu is shown.
+To disable context menu completely set \a flags to 0.
 \sa Hb::TextContextMenuFlag
 */
 void HbAbstractEdit::setContextMenuFlags(Hb::TextContextMenuFlags flags)
 {
 Q_D(HbAbstractEdit);
 d->updatePlaceholderDocProperties();
 }
 QString txt( placeholderText );
 #ifdef HB_TEXT_MEASUREMENT_UTILITY
-if ( HbFeatureManager::instance()->featureStatus( HbFeatureManager::TextMeasurement ) ) {
+if (HbTextMeasurementUtility::instance()->locTestMode()) {
 if (placeholderText.endsWith(QChar(LOC_TEST_END))) {
 int index = placeholderText.indexOf(QChar(LOC_TEST_START));
 setProperty( HbTextMeasurementUtilityNameSpace::textIdPropertyName,  placeholderText.mid(index + 1, placeholderText.indexOf(QChar(LOC_TEST_END)) - index - 1) );
 setProperty( HbTextMeasurementUtilityNameSpace::textMaxLines, -1 );
 txt = placeholderText.left(index);
 or an empty string if no anchor exists at that point.
 */
 QString HbAbstractEdit::anchorAt(const QPointF &pos) const
 {
 Q_D(const HbAbstractEdit);
-return d->doc->documentLayout()->anchorAt(pos);
+return d->doc->documentLayout()->anchorAt(mapToItem(d->canvas,pos));
 }
 /*!
 Returns the reference of the anchor the given cursor position,
 or an empty string if no anchor exists at that position.
 /*!
 \reimp
 */
 QVariant HbAbstractEdit::itemChange(GraphicsItemChange change, const QVariant &value)
 {
-Q_D(const HbAbstractEdit);
+Q_D(HbAbstractEdit);
 if (change == QGraphicsItem::ItemScenePositionHasChanged) {
 if (d->selectionControl) {
 d->selectionControl->updatePrimitives();
 }
+} else if (change == QGraphicsItem::ItemEnabledHasChanged) {
+if(!value.toBool()) {
+if (d->hasInputFocus()) {
+d->closeInputPanel();
+}
+deselect();
+}
+updatePrimitives();
 }
 return HbWidget::itemChange(change, value);
 }
 /*!
 QChar HbAbstractEdit::characterAt(int pos) const
 {
 return document()->characterAt(pos);
 }
+/*!
+Activates or deactivates the selection control in the editor.
+The selection control can be used to resize the selection or fine tune the cursor position.
+Note: if the selection control is disabled the word selection is still possible by double-tap on word of text.
+*/
+void HbAbstractEdit::setSelectionControlEnabled(bool enabled)
+{
+Q_D(HbAbstractEdit);
+if(d->enableSelectionControl != enabled) {
+d->enableSelectionControl = enabled;
+if(enabled && (d->hasInputFocus() || d->cursor.hasSelection())) {
+d->selectionControl = HbSelectionControl::attachEditor(this);
+d->selectionControl->setMagnifierEnabled(d->enableMagnifier);
+d->selectionControl->showHandles();
+} else if (d->selectionControl) {
+d->selectionControl->hideHandles();
+}
+d->updateCursorType();
+}
+}
+/*!
+Return true if selection control is enabled in the editor otherwise returns false.
+*/
+bool HbAbstractEdit::isSelectionControlEnabled() const
+{
+Q_D(const HbAbstractEdit);
+return d->enableSelectionControl;
+}
 void HbAbstractEdit::gestureEvent(QGestureEvent* event) {
 Q_D(HbAbstractEdit);
-if(HbTapGesture *tap = qobject_cast<HbTapGesture*>(event->gesture(Qt::TapGesture))) {
+d->gestureEvent(event);
-// QTapGesture::position() is in screen coordinates and thus
-// needs to be transformed into items own coordinate system.
-// The QGestureEvent knows the viewport through which the gesture
-// was triggered.
-QPointF pos = mapFromScene(event->mapToGraphicsScene(tap->position()));
-switch(tap->state()) {
-case Qt::GestureStarted:
-scene()->setProperty(HbPrivate::OverridingGesture.latin1(),Qt::TapGesture);
-if (!tap->property(HbPrivate::ThresholdRect.latin1()).toRect().isValid()) {
-tap->setProperty(HbPrivate::ThresholdRect.latin1(), mapRectToScene(boundingRect()).toRect());
-}
-d->tapPosition = pos;
-HbWidgetFeedback::triggered(this, Hb::InstantPressed);
-break;
-case Qt::GestureUpdated:
-if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
-d->openInputPanel();
-d->longTapGesture(pos);
-}
-break;
-case Qt::GestureFinished:
-scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
-if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
-} else {
-d->tapGesture(pos);
-}
-HbWidgetFeedback::triggered(this, Hb::InstantReleased);
-d->openInputPanel();
-break;
-case Qt::GestureCanceled:
-scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
-break;
-default:
-break;
-}
-event->accept();
-} else {
-event->ignore();
-}
 }
 /*!
 Returns the filtered text, or \a text if no input filter attached to editor.
 */

changeset 34	ed14f46c0e55
parent 7	923ff622b8b9