Changeset 56805 in webkit

Timestamp:

Mar 30, 2010 1:10:52 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-30 Joe Ligman <​joseph.ligman@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QGraphicsScene mousePressEvent does not set the clickCausedFocus flag
​https://bugs.webkit.org/show_bug.cgi?id=35259

The clickCausedFocus flag is not being set in method
mousePressEvent(QGraphicsSceneMouseEvent* ev). This flag is used
in conjunction with QStyle::RSIP_OnMouseClickAndAlreadyFocused when
deciding to launch the software input panel.

• Api/qwebpage.cpp: (QWebPagePrivate::mousePressEvent):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -798 +798 @@
         return;
 
+    RefPtr<WebCore::Node> oldNode;
+    if (page->focusController()->focusedFrame()
+        && page->focusController()->focusedFrame()->document())
+        oldNode = page->focusController()->focusedFrame()->document()->focusedNode();
+
     if (tripleClickTimer.isActive()
             && (ev->pos().toPoint() - tripleClick).manhattanLength()
@@ -811 +816 @@
         accepted = frame->eventHandler()->handleMousePressEvent(mev);
     ev->setAccepted(accepted);
+
+    RefPtr<WebCore::Node> newNode;
+    if (page->focusController()->focusedFrame()
+        && page->focusController()->focusedFrame()->document())
+        newNode = page->focusController()->focusedFrame()->document()->focusedNode();
+
+    if (newNode && oldNode != newNode)
+        clickCausedFocus = true;
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-03-30  Joe Ligman  <joseph.ligman@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QGraphicsScene mousePressEvent does not set the clickCausedFocus flag
+        https://bugs.webkit.org/show_bug.cgi?id=35259
+
+        The clickCausedFocus flag is not being set in method
+        mousePressEvent(QGraphicsSceneMouseEvent* ev). This flag is used 
+        in conjunction with QStyle::RSIP_OnMouseClickAndAlreadyFocused when
+        deciding to launch the software input panel.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::mousePressEvent):
+
 2010-03-30  Luiz Agostini  <luiz.agostini@openbossa.org>