Changeset 56334 in webkit

Timestamp:

Mar 22, 2010 8:09:58 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-22 Yi Shen <​shenyi2006@gmail.com>

Reviewed by Simon Hausmann.

​https://bugs.webkit.org/show_bug.cgi?id=35933
[Qt] [Symbian] Can not backward select (highlight) text using virtual keyboard
Make sure the selection start index is smaller than the selection end index.

• Api/qwebpage.cpp: (QWebPagePrivate::inputMethodEvent):
• tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::inputMethods):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• tests/qwebpage/tst_qwebpage.cpp (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -1317 +1317 @@
         case QInputMethodEvent::Selection: {
             if (renderTextControl) {
-                renderTextControl->setSelectionStart(a.start);
-                renderTextControl->setSelectionEnd(a.start + a.length);
+                renderTextControl->setSelectionStart(qMin(a.start, (a.start + a.length)));
+                renderTextControl->setSelectionEnd(qMax(a.start, (a.start + a.length)));
             }
             break;

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-03-22  Yi Shen  <shenyi2006@gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35933  
+        [Qt] [Symbian] Can not backward select (highlight) text using virtual keyboard
+        Make sure the selection start index is smaller than the selection end index.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+
 2010-03-21  Kristian Amlie  <kristian.amlie@nokia.com>
 

trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -1404 +1404 @@
     QString selectionValue = variant.value<QString>();
     QCOMPARE(selectionValue, QString("eb"));
+
+    //Set selection with negative length
+    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 6, -5, QVariant());
+    QInputMethodEvent eventSelection2("",inputAttributes);
+    page->event(&eventSelection2);
+
+    //ImAnchorPosition
+    variant = page->inputMethodQuery(Qt::ImAnchorPosition);
+    anchorPosition =  variant.toInt();
+    QCOMPARE(anchorPosition, 1);
+
+    //ImCursorPosition
+    variant = page->inputMethodQuery(Qt::ImCursorPosition);
+    cursorPosition =  variant.toInt();
+    QCOMPARE(cursorPosition, 6);
+
+    //ImCurrentSelection
+    variant = page->inputMethodQuery(Qt::ImCurrentSelection);
+    selectionValue = variant.value<QString>();
+    QCOMPARE(selectionValue, QString("tWebK"));
 #endif