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

equal deleted inserted replaced

-:c3690ec91ef8
+:923ff622b8b9
 #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_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
 /*!
 \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();
 }
 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)
 d->updatePrimitivesInProgress = true;
 HbWidget::updatePrimitives();
 if (d->scrollArea) {
-d->doc->setTextWidth(d->scrollArea->size().width());
+if(!qFuzzyCompare(d->doc->textWidth(), d->scrollArea->size().width())){
-if(d->placeholderDoc) {
+d->doc->setTextWidth(d->scrollArea->size().width());
-d->placeholderDoc->setTextWidth(d->scrollArea->size().width());
+if(d->placeholderDoc) {
+d->placeholderDoc->setTextWidth(d->scrollArea->size().width());
+}
 }
 }
 QRectF canvasGeom(QRectF(QPointF(0,0),d->doc->size()));
 if(d->scrollArea) {
 canvasGeom.setHeight(qMax(d->scrollArea->size().height(), d->doc->size().height()));
 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(hbTrId("txt_common_menu_cut")), SIGNAL(triggered()),
 this, SLOT(cut()));
 }
 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();

changeset 7	923ff622b8b9
parent 6	c3690ec91ef8
child 21	4633027730f5
child 34	ed14f46c0e55