Title: [102674] trunk/Source/WebKit2
- Revision
- 102674
- Author
- [email protected]
- Date
- 2011-12-13 05:28:32 -0800 (Tue, 13 Dec 2011)
Log Message
[Qt] Make sure that touch events result in the page view gaining focus
Reviewed by Simon Hausmann.
* UIProcess/API/qt/qquickwebpage.cpp:
(QQuickWebPage::touchEvent): Force active focus.
* UIProcess/API/qt/qquickwebview.cpp:
* UIProcess/API/qt/qquickwebview_p.h: Remove ::touchEvent override.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (102673 => 102674)
--- trunk/Source/WebKit2/ChangeLog 2011-12-13 13:23:54 UTC (rev 102673)
+++ trunk/Source/WebKit2/ChangeLog 2011-12-13 13:28:32 UTC (rev 102674)
@@ -1,3 +1,14 @@
+2011-12-13 Kenneth Rohde Christiansen <[email protected]>
+
+ [Qt] Make sure that touch events result in the page view gaining focus
+
+ Reviewed by Simon Hausmann.
+
+ * UIProcess/API/qt/qquickwebpage.cpp:
+ (QQuickWebPage::touchEvent): Force active focus.
+ * UIProcess/API/qt/qquickwebview.cpp:
+ * UIProcess/API/qt/qquickwebview_p.h: Remove ::touchEvent override.
+
2011-12-13 Carlos Garcia Campos <[email protected]>
[GTK] Initial UI client implementation for WebKit2 GTK +API
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp (102673 => 102674)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp 2011-12-13 13:23:54 UTC (rev 102673)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp 2011-12-13 13:28:32 UTC (rev 102674)
@@ -156,6 +156,7 @@
void QQuickWebPage::touchEvent(QTouchEvent* event)
{
+ forceActiveFocus();
this->event(event);
}
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (102673 => 102674)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-13 13:23:54 UTC (rev 102673)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2011-12-13 13:28:32 UTC (rev 102674)
@@ -706,12 +706,6 @@
d->pageView->event(event);
}
-void QQuickWebView::touchEvent(QTouchEvent* event)
-{
- forceActiveFocus();
- QQuickItem::touchEvent(event);
-}
-
WKPageRef QQuickWebView::pageRef() const
{
Q_D(const QQuickWebView);
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (102673 => 102674)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-13 13:23:54 UTC (rev 102673)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2011-12-13 13:28:32 UTC (rev 102674)
@@ -120,7 +120,6 @@
virtual void geometryChanged(const QRectF&, const QRectF&);
virtual void focusInEvent(QFocusEvent*);
virtual void focusOutEvent(QFocusEvent*);
- virtual void touchEvent(QTouchEvent* event);
private:
Q_DECLARE_PRIVATE(QQuickWebView)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
