FCL/sf/app/commonemail: comparison emailuis/nmailui/src/nmeditorcontent.cpp

equal deleted inserted replaced

-:4e54af54a4a1
+:6c59112cfd31
 // The following line is necessary in terms of being able to add emoticons
 // (smileys) to an empty document (mail content). Otherwise the private
 // pointer of the QTextDocument which the smiley engine has is NULL and
 // inserting a smiley will lead to an error.
 mEditorWidget->setPlainText("");
+QCoreApplication::instance()->installEventFilter(this); // see eventFilter()
 }
 /*!
 Destructor
 */
 NmEditorContent::~NmEditorContent()
 {
 NM_FUNCTION;
+QCoreApplication::instance()->removeEventFilter(this); // see eventFilter()
 }
 /*!
 Sets the body content. If reply envelopw is present, reply header is generated and set to
 editor. Reply envelope ownership is not transferred here.
 	QTextCursor cursor(mEditorWidget->document());
 // Create the "reply" header (also for forward message)
 	// sets the font color of the reply header and the original body text to black
-if ((editorStartMode==NmUiEditorReply || editorStartMode==NmUiEditorReplyAll ||
+if ((editorStartMode == NmUiEditorReply || editorStartMode == NmUiEditorReplyAll ||
-editorStartMode==NmUiEditorForward) && originalMessage) {
+editorStartMode == NmUiEditorForward) && originalMessage) {
 		bodyContent.append(QString("<style type=\"text/css\">* { color: black; }</style>"));
 bodyContent.append(NmUtilities::createReplyHeader(originalMessage->envelope()));
 }
 // Check which part is present. Html or plain text part. We use the original message parts.
 plainPart = originalMessage->plainTextBodyPart();
 }
 if (htmlPart) {
 QString bodyText(htmlPart->textContent());
-if (editorStartMode==NmUiEditorReply || editorStartMode==NmUiEditorReplyAll ||
+if (editorStartMode == NmUiEditorReply || editorStartMode == NmUiEditorReplyAll ||
-editorStartMode==NmUiEditorForward) {
+editorStartMode == NmUiEditorForward) {
 convertBodyStylesToDivision(bodyText);
 }
-if(editorStartMode==NmUiEditorReply || editorStartMode==NmUiEditorReplyAll ) {
+if(editorStartMode == NmUiEditorReply || editorStartMode == NmUiEditorReplyAll ) {
 removeEmbeddedImages(bodyText);
 }
 bodyContent.append(bodyText);
-cursor.insertHtml(bodyContent);
 }
 else if (plainPart) {
 // Plain text part was present, set it to HbTextEdit as HTML
 bodyContent.append(QString("<html><body><p>"));
 bodyContent.append(plainPart->textContent());
 // Update of the body width is done when next contentChanged signal comes from the body.
 mNeedForWidthAdjustment = true;
 	cursor.clearSelection();
 	cursor.setPosition(0);
 	cursor.insertHtml(QString("<html><body></body></html>"));
+	mEditorWidget->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
+	QMetaObject::invokeMethod(this, "ensureCursorVisibility", Qt::QueuedConnection);
 }
 /*!
 This method creates all needed signal-slot connections
 */
 Qt::QueuedConnection);
 // we are interested in the document's height changes
 connect(mEditorWidget->document()->documentLayout(), SIGNAL(documentSizeChanged(QSizeF)), this,
 SLOT(setEditorContentHeight()), Qt::QueuedConnection);
-// We need to update the scroll position according the editor's cursor position
-connect(mHeader->toEdit(), SIGNAL(cursorPositionChanged(int, int)), this,
-SLOT(ensureCursorVisibility()), Qt::QueuedConnection);
-connect(mHeader->ccEdit(), SIGNAL(cursorPositionChanged(int, int)), this,
-SLOT(ensureCursorVisibility()), Qt::QueuedConnection);
-connect(mHeader->bccEdit(), SIGNAL(cursorPositionChanged(int, int)), this,
-SLOT(ensureCursorVisibility()), Qt::QueuedConnection);
-connect(mHeader->subjectEdit(), SIGNAL(cursorPositionChanged(int, int)), this,
-SLOT(ensureCursorVisibility()), Qt::QueuedConnection);
-connect(mEditorWidget, SIGNAL(cursorPositionChanged(int, int)), this,
-SLOT(ensureCursorVisibility()), Qt::QueuedConnection);
 // listen to the parent's (NmEditorView) size changes which happen eg. when VKB is opened/closed
 connect(parent(), SIGNAL(sizeChanged()), this, SLOT(ensureCursorVisibility()),
 Qt::QueuedConnection);
 }
 }
 /*!
 This slot is called when the cursor visibility has to be ensured ie. the scroll position is
-adjusted so that the cursor can be seen.
+adjusted so that the cursor can be seen. For defining exatcly what area is ensured the
+same algorithm that HbAbstractEditPrivate::ensurePositionVisible() uses is used here.
 */
 void NmEditorContent::ensureCursorVisibility()
 {
 NM_FUNCTION;
 localRect = mEditorWidget->rectForCursorPosition();
 }
 // ensure that the cursor position is visible
 if (focused && !localRect.isEmpty()) {
-QPointF topLeftPos = focused->mapToItem(mScrollAreaContents, localRect.topLeft());
+QRectF rect = focused->mapRectToItem(mScrollAreaContents, localRect);
-QPointF bottomRightPos =
+mScrollArea->ensureVisible(rect.center(), rect.width(), rect.height() / 2 );
-focused->mapToItem(mScrollAreaContents, localRect.bottomRight());
-qreal marginRight = 0;
-if (mScrollArea->style()) {
-mScrollArea->style()->parameter("hb-param-margin-gene-right", marginRight);
-}
-bottomRightPos.rx() += marginRight;
-mScrollArea->ensureVisible(topLeftPos);
-mScrollArea->ensureVisible(bottomRightPos);
 }
 }
 /*!
 Removes embedded images from the message body
 */
 qreal headerWidth = mApplication.screenSize().width() - margin - margin;
 // Create translation object for header position adjustment.
 QRectF editorBodyRect = mEditorWidget->geometry();
 QTransform tr;
-qreal leftMovementThreshold(editorBodyRect.width() - headerWidth);
+qreal bodyWidth = editorBodyRect.width();
+if ( bodyWidth < mApplication.screenSize().width() ) {
+	    bodyWidth = mApplication.screenSize().width();
+}
+qreal leftMovementThreshold( bodyWidth - headerWidth);
 if (scrollPosition.x() < 0) {
 // Left side positioning. Allow left side baunch effect.
 tr.translate(editorBodyRect.topLeft().x() - margin ,0);
 }
 else if (scrollPosition.x() >= 0 && scrollPosition.x() < leftMovementThreshold) {
 QRegExp bodyStyleDefinedRegExp(bodyStyleDefined, Qt::CaseInsensitive);
 bodyStyleDefinedRegExp.setMinimal(true);
 QString bodyStartReplacement("<body>\n<div");
-if(bodyContent.contains(bodyStyleDefinedRegExp)) {
+if (bodyContent.contains(bodyStyleDefinedRegExp)) {
 QString headPartString = bodyStyleDefinedRegExp.cap(0);
 QString headBodyStyleString("body(\\s)*");
 QRegExp bodyStyleReplacementRegExp(headBodyStyleString, Qt::CaseInsensitive);
-if(headPartString.contains(bodyStyleReplacementRegExp)) {
+if (headPartString.contains(bodyStyleReplacementRegExp)) {
 headPartString.replace(bodyStyleReplacementRegExp, "div.reply ");
 bodyContent.replace(bodyStyleDefinedRegExp, headPartString);
 bodyStartReplacement = "<body>\n<div class=\"reply\"";
 }
 *  <body>
 *  <div style="background: #00ff00; color: red; border: solid">
 *  This is the body text.
 *  </div>
 *  </body>
-*
-*  TODO: Tämä tapahtuu toistaiseksi riippumatta siitä onko bodyssa style-määrittelyä.
-*  TODO: Entä jos dokumentissa on määritelty useampi <body>?
 */
 void NmEditorContent::convertBodyToDiv(QString &bodyContent, const QString &replacementString)
 {
 NM_FUNCTION;
 */
 void NmEditorContent::convertBGColorToStyle(QString &bodyContent)
 {
 NM_FUNCTION;
-QString bgColorInBodyFetchString("<body[^<]+(bgcolor(\\s|)=(\\s|)(\"|)(#|))*>");
+QString bgColorInBodyFetchString("<body"
+"[^<]+"             // 1...* any character except '<'
+"(bgcolor"
+"(\\s|)"            // White space or nothing
+"="
+"(\\s|)"            // White space or nothing
+"(\"|)"             // '"' or nothing
+"(#|))"             // '#' or nothing
+"*>");              // 0...* Any character + >
 QRegExp bgColorInBodyRegExp(bgColorInBodyFetchString, Qt::CaseInsensitive);
-if(bodyContent.contains(bgColorInBodyRegExp)) {
+if (bodyContent.contains(bgColorInBodyRegExp)) {
 // There can be only one meaningful bgcolor, the first one.
 QString bgColorString = bgColorInBodyRegExp.cap(0);
 // Extract the color code from the string
 QString colorCode(bgColorString);
 "="
 "(\\s|)"        // White space or nothing
 "(\"|)"         // '"' or nothing
 "(#|)",         // '#' or nothing
 Qt::CaseInsensitive);
 colorCode.remove(removeBeginningRegExp);
 QRegExp removeEndRegExp(""
 "((\"|\\s)"     // '"' or white space
 "([^<]*)"       // 0...* any characters except '<'
 ">)"            // '>'
 "|>");          // ... or nothing before this, just '>'
 colorCode.remove(removeEndRegExp);
-QString plainBgColorFetchString("bgcolor(\\s|)*=(\\s|)*[^\\s]+(\\s|(?=>))");
+QString plainBgColorFetchString("bgcolor"
+"(\\s|)*"       // 0...* White space or nothing
+"="
+"(\\s|)*"       // 0...* White space or nothing
+"[^\\s]+"       // 1...* any character except white space
+"(\\s|(?=>))"); // White space or follower by '>'
 QString bgColorReplacement("style=\"background: #"+colorCode+"\" ");
 QRegExp plainBgColorFetchRegExp(plainBgColorFetchString, Qt::CaseInsensitive);
 // Create temporary string for bgcolor
 bgColorString.replace(plainBgColorFetchRegExp, bgColorReplacement);
 // Copy the contents of the temporary string to the message
 bodyContent.replace(bgColorInBodyRegExp, bgColorString);
 }
 }
+/*!
+*  Listen to the input method events (eg. cursor position changes, preedit text changes etc.) and
+*  invoke ensureCursorVisibility. Qt FW does not automatically ensure the visiblity of a text in a
+*  edit widget in our custom scroll area. Filtering events is the only way to get events of the
+*  preedit text changes.
+*/
+bool NmEditorContent::eventFilter(QObject *obj, QEvent *event)
+{
+// let the FW handle the event first
+bool ret = QObject::eventFilter(obj, event);
+if (event && event->type() == QEvent::InputMethod) {
+QMetaObject::invokeMethod(this, "ensureCursorVisibility", Qt::QueuedConnection);
+}
+return ret;
+}

changeset 74	6c59112cfd31
parent 68	83cc6bae1de8