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

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 #include "hbevent.h"
 #include "hbwidgetfeedback.h"
 #include "hbmenu.h"
 #include "hbaction.h"
 #include "hbselectioncontrol_p.h"
-#include "hbmeshlayout_p.h"
 #include "hbsmileyengine_p.h"
 #include "hbinputeditorinterface.h"
-#include "hbfeaturemanager_p.h"
+#include "hbfeaturemanager_r.h"
 #include "hbtextmeasurementutility_p.h"
 #include "hbtapgesture.h"
 #include "hbpangesture.h"
+#include "hbnamespace_p.h"
 #include <QApplication>
 #include "hbpopup.h"
 #include "hbformatdialog.h"
 #include <QTextList>
 #include <QPainter>
 #include <QTextBlock>
 #include <QAbstractTextDocumentLayout>
 #include <QClipboard>
 #include <QInputContext>
+#include <QGraphicsScene>
 /*!
 \class HbAbstractEdit
 \brief HbAbstractEdit is a base class for all text editors.
 @proto
 This signal is emitted when cursor position has been changed.
 */
 /*!
+\fn void anchorTapped(const QString &anchor)
+This signal is emitted when a tap gesture happens on a word which has anchor attached.
+*/
+/*!
 \fn QString HbAbstractEdit::toPlainText() const
 Returns the contents as plain text.
 \sa QTextDocument::toPlainText()
 */
 HbAbstractEdit::~HbAbstractEdit()
 {
 Q_D(HbAbstractEdit);
 if (d->selectionControl) {
-d->selectionControl->detachEditor();
+d->selectionControl->detachEditorFromDestructor();
 }
 }
 /*!
 \reimp
 /*!
 \reimp
 */
 bool HbAbstractEdit::event(QEvent* event)
 {
+Q_D(HbAbstractEdit);
 if(event->type() ==  QEvent::DynamicPropertyChange) {
 const QString p = static_cast<QDynamicPropertyChangeEvent *>(event)->propertyName();
 if(p == "SmileyIcon") {
 Q_D(HbAbstractEdit);
 QString iconName = property("SmileyIcon").toString();
 matchCursor.setPosition(oldPos);
 d->smileyEngineInstance()->insertSmiley(matchCursor);
 d->cursorChanged(HbValidator::CursorChangeFromContentUpdate);
 }
-}
+} else { //HbEvent handler
+if (event->type() == HbEvent::InputMethodFocusIn) {
+d->setInputFocusEnabled(true);
+} else if (event->type() == HbEvent::InputMethodFocusOut) {
+d->setInputFocusEnabled(false);
+}
+}
 return HbWidget::event(event);
 }
 QVariant HbAbstractEdit::inputMethodQuery (Qt::InputMethodQuery query) const
 {
 return QVariant(d->cursor.position() - block.position());
 case Qt::ImSurroundingText:
 return QVariant(block.text());
 case Qt::ImCurrentSelection:
 return QVariant(d->cursor.selectedText());
+case Qt::ImMaximumTextLength:
+return QVariant(); // No limit.
+case Qt::ImAnchorPosition:
+return QVariant(qBound(0, d->cursor.anchor() - block.position(), block.length()));
 default:
 return QVariant();
 }
 }
 d->imAdded = e->commitString().length();
 d->imRemoved =  e->replacementLength();
 d->_q_contentsChanged();
 }
-if(hasFocus()) {
+if(d->hasInputFocus()) {
 d->cursorOn = true;
 }
 d->ensureCursorVisible();
 }
 if (d->interactionFlags & Qt::TextSelectableByKeyboard
 && d->cursorMoveKeyEvent(event))
 d->acceptKeyPressEvent(event);
 if (!(d->interactionFlags & Qt::TextEditable)) {
-d->repaintOldAndNewSelection(d->selectionCursor);
 d->cursorChanged(HbValidator::CursorChangeFromContentUpdate);
-//ensureCursorVisible();
 event->ignore();
 return;
 }
 if (event->key() == Qt::Key_Direction_L || event->key() == Qt::Key_Direction_R) {
 d->selectionControl = HbSelectionControl::attachEditor(this);
 if (d->interactionFlags & Qt::NoTextInteraction)
 return;
-update(d->selectionRect());
+// It sets the cursor the focus item's depending on if
+// the input panel is connceted or not
-if (d->interactionFlags & Qt::TextEditable) {
+d->setInputFocusEnabled(d->hasInputFocus());
-d->setBlinkingCursorEnabled(true);
-} else {
-d->cursorOn = (d->interactionFlags & Qt::TextSelectableByKeyboard);
-}
-d->openInputPanel();
 event->accept();
 }
 /*!
 Q_D(HbAbstractEdit);
 if (d->interactionFlags & Qt::NoTextInteraction)
 return;
-d->setBlinkingCursorEnabled(false);
+// It sets the cursor the focus item's depending on if
-d->repaintOldAndNewSelection(d->selectionCursor);
+// the input panel is connceted or not
+d->setInputFocusEnabled(d->hasInputFocus());
 event->accept();
 }
 /*!
 Q_D(HbAbstractEdit);
 HbWidget::hideEvent(event);
 deselect();
-if(hasFocus() && !isReadOnly() && !panel()) {
+if(d->hasInputFocus() && !isReadOnly() && !panel()) {
 d->closeInputPanel();
 }
 }
 f ^= Qt::TextEditable;
 d->setTextInteractionFlags(f);
 setFlag(QGraphicsItem::ItemAcceptsInputMethod, !value);
+if (value && d->hasInputFocus()) {
+d->closeInputPanel();
+}
 }
 /*!
 \deprecated HbAbstractEdit::primitive(HbStyle::Primitive)
 \reimp
 */
 void HbAbstractEdit::updatePrimitives()
 {
 Q_D(HbAbstractEdit);
-HbWidget::updatePrimitives();
+if (d->polished && !d->updatePrimitivesInProgress) {
-if (d->scrollArea) {
-d->doc->setTextWidth(d->scrollArea->size().width());
+d->updatePrimitivesInProgress = true;
-if(d->placeholderDoc) {
-d->placeholderDoc->setTextWidth(d->scrollArea->size().width());
+HbWidget::updatePrimitives();
-}
-}
+if (d->scrollArea) {
-QRectF canvasGeom(QRectF(QPointF(0,0),d->doc->size()));
+if(!qFuzzyCompare(d->doc->textWidth(), d->scrollArea->size().width())){
-if(d->scrollArea) {
+d->doc->setTextWidth(d->scrollArea->size().width());
-canvasGeom.setHeight(qMax(d->scrollArea->size().height(), d->doc->size().height()));
+if(d->placeholderDoc) {
-}
+d->placeholderDoc->setTextWidth(d->scrollArea->size().width());
-//Changed from setGeometry() to setPreferredSize() because it causes
+}
-//weird input behavior otherwise.
+}
-d->canvas->setPreferredSize(canvasGeom.size());
+}
-d->ensureCursorVisible();
+QRectF canvasGeom(QRectF(QPointF(0,0),d->doc->size()));
-if (d->selectionControl) {
+if(d->scrollArea) {
-d->selectionControl->updatePrimitives();
+canvasGeom.setHeight(qMax(d->scrollArea->size().height(), d->doc->size().height()));
 }
+d->canvas->setGeometry(canvasGeom);
+d->ensureCursorVisible();
+if (d->selectionControl) {
+d->selectionControl->updatePrimitives();
+}
+d->updatePrimitivesInProgress=false;
+}
 }
 /*!
 Replaces editor content with \a text.
 \sa QTextDocument::documentSizeChanged(QSizeF size)
 */
 void HbAbstractEdit::documentSizeChanged(const QSizeF &size)
 {
 Q_UNUSED(size)
 updateGeometry();
 updatePrimitives();
 }
 /*!
 Q_D(HbAbstractEdit);
 // QTextCursor operator!= compares only position
 if (    cursor.position() != d->cursor.position()
 ||  cursor.anchor() != d->cursor.anchor() ) {
-const QTextCursor oldCursor = d->cursor;
 d->cursor = cursor;
 d->updateCurrentCharFormat();
 d->ensureCursorVisible();
-d->repaintOldAndNewSelection(oldCursor);
 d->cursorChanged(HbValidator::CursorChangeFromContentSet);
 }
 }
 /*!
 if (cursorPos == -1)
 return;
 setCursorPosition(cursorPos);
-const QTextCursor oldSelection = d->cursor;
 d->cursor.select(QTextCursor::WordUnderCursor);
-emit selectionChanged(oldSelection, d->cursor);
-d->repaintOldAndNewSelection(oldSelection);
 d->cursorChanged(HbValidator::CursorChangeFromMouse);
-//TODO: focus is in VKB so needs to re-focus to editor
-//    setFocus();
 }
 /*!
 Selects all the text in the editor.
 \sa selectClickedWord deselect
 */
 void HbAbstractEdit::selectAll()
 {
 Q_D(HbAbstractEdit);
-const QTextCursor oldSelection = d->cursor;
 d->cursor.select(QTextCursor::Document);
-emit selectionChanged(oldSelection, d->cursor);
-d->repaintOldAndNewSelection(oldSelection);
 d->cursorChanged(HbValidator::CursorChangeFromMouse);
 }
 /*!
 Deselects the text in the editor if there is text selected.
 \sa selectClickedWord selectAll
 */
 void HbAbstractEdit::deselect()
 {
 Q_D(HbAbstractEdit);
-const QTextCursor oldSelection = d->cursor;
 d->cursor.clearSelection();
-emit selectionChanged(oldSelection, d->cursor);
+d->cursorChanged(HbValidator::CursorChangeFromMouse);
 }
 /*!
 Launches the format user interface.
 */
 QTextDocumentFragment fragment;
 #ifndef QT_NO_TEXTHTMLPARSER
 if (source->hasFormat(QLatin1String("application/x-qrichtext"))) {
 QString richtext = QString::fromUtf8(source->data(QLatin1String("application/x-qrichtext")));
 richtext.prepend(QLatin1String("<meta name=\"qrichtext\" content=\"1\" />"));
-fragment = QTextDocumentFragment::fromHtml(filterInputText(richtext), d->doc);
+fragment = QTextDocumentFragment::fromHtml(richtext, d->doc);
 hasData = true;
 } else if (source->hasHtml()) {
-fragment = QTextDocumentFragment::fromHtml(filterInputText(source->html()), d->doc);
+fragment = QTextDocumentFragment::fromHtml(source->html(), d->doc);
 hasData = true;
 } else
 #endif //QT_NO_TEXTHTMLPARSER
 {
 QString text = source->text();
 */
 void HbAbstractEdit::setValidator(HbValidator* validator)
 {
 Q_D(HbAbstractEdit);
-if(d->validator) {
+d->validator = validator;
-delete d->validator;
+d->initValidator();
-d->validator = 0;
-}
-if(validator) {
-d->validator = validator;
-d->initValidator();
-}
 }
 /*!
 \property QLineEdit::acceptableInput
 This property holds whether the input satisfies the validator.
 \sa QTextCursor::movePosition()
 */
 void HbAbstractEdit::moveCursor(QTextCursor::MoveOperation op, QTextCursor::MoveMode mode)
 {
 Q_D(HbAbstractEdit);
-//const QTextCursor oldCursor = d->cursor;
 d->cursor.movePosition(op, mode);
 d->updateCurrentCharFormat();
 d->ensureCursorVisible();
 QTextCursor previousCursor(d->cursor);
 previousCursor.setPosition(d->previousCursorAnchor);
 previousCursor.setPosition(d->previousCursorPosition, QTextCursor::KeepAnchor);
-d->repaintOldAndNewSelection(previousCursor);
 d->cursorChanged(HbValidator::CursorChangeFromOperation);
 }
 /*!
 Returns the bounding rect for given text block.
 void HbAbstractEdit::showContextMenu(QPointF position)
 {
 Q_D(HbAbstractEdit);
 HbMenu *menu = createContextMenu();
+QTextBlock block = d->cursor.block();
+QTextLayout *layout = block.layout();
+if(layout && !layout->preeditAreaText().isEmpty())
+{
+// there's pre-edit text present, it needs to be commited 1st
+if(qApp->inputContext()) {
+qApp->inputContext()->reset();
+}
+}
 if (!menu) {
 menu = new HbMenu();
 }
-menu->setAttribute(Hb::InputMethodNeutral);
 if (d->cursor.hasSelection() && d->canCut()) {
 connect(
-menu->addAction("Cut"), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_cut")), SIGNAL(triggered()),
 this, SLOT(cut()));
 }
 if (d->cursor.hasSelection() && d->canCopy()) {
 connect(
-menu->addAction("Copy"), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_copy")), SIGNAL(triggered()),
 this, SLOT(copy()));
 }
 if (!d->cursor.hasSelection() && !d->doc->isEmpty() && d->canCopy()){
 connect(
-menu->addAction("Select"), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_select")), SIGNAL(triggered()),
 this, SLOT(selectClickedWord()));
 connect(
-menu->addAction("Select all"), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_select_all_contents")), SIGNAL(triggered()),
 this, SLOT(selectAll()));
 }
 if (d->canPaste()) {
 connect(
-menu->addAction("Paste"), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_paste")), SIGNAL(triggered()),
 this, SLOT(paste()));
 }
 if (d->cursor.hasSelection()) {
 connect(
-menu->addAction("Deselect"), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_deselect")), SIGNAL(triggered()),
 this, SLOT(deselect()));
 }
 if (d->canFormat()) {
 connect(
-menu->addAction("Format"), SIGNAL(triggered()),
+menu->addAction(hbTrId("txt_common_menu_format")), SIGNAL(triggered()),
 this, SLOT(format()));
 }
 emit aboutToShowContextMenu(menu, d->tapPosition);
 if(menu->actions().count() > 0){
-d->minimizeInputPanel();
+//        d->minimizeInputPanel();
 menu->setPreferredPos(position);
 menu->show();
 }
 }
 // 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->longTapGesture(pos);
+d->openInputPanel();
+d->longTapGesture(pos);
 }
 break;
 case Qt::GestureFinished:
+scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
 if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
 } else {
 d->tapGesture(pos);
 }
 d->openInputPanel();
 break;
 case Qt::GestureCanceled:
+scene()->setProperty(HbPrivate::OverridingGesture.latin1(),QVariant());
 break;
 default:
 break;
 }
 event->accept();
 /*!
 Returns the filtered text, or \a text if no input filter attached to editor.
 */
 QString HbAbstractEdit::filterInputText(const QString &text)
 {
-HbEditorInterface editorInterface(this);
+Q_D(HbAbstractEdit);
-HbInputFilter *inputFilter = editorInterface.filter();
+QString filteredText(text);
-if (!text.isEmpty() && inputFilter) {
+d->filterInputText(filteredText);
-QString filteredText;
+return filteredText;
-foreach(QChar c, text) {
+}
-if (inputFilter->filter(c)) {
-filteredText.append(c);
-}
-}
-return filteredText;
-}
-return text;
-}

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 7	923ff622b8b9
child 21	4633027730f5
child 34	ed14f46c0e55