Title: [104156] trunk/Source/WebKit2
- Revision
- 104156
- Author
- [email protected]
- Date
- 2012-01-05 06:58:36 -0800 (Thu, 05 Jan 2012)
Log Message
[Qt] Implement QQuickWebView::inputMethodQuery
Reviewed by Simon Hausmann.
Implement the current Qt5 queries of inputMethodQuery.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebView::inputMethodQuery):
* UIProcess/API/qt/qquickwebview_p.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (104155 => 104156)
--- trunk/Source/WebKit2/ChangeLog 2012-01-05 14:57:46 UTC (rev 104155)
+++ trunk/Source/WebKit2/ChangeLog 2012-01-05 14:58:36 UTC (rev 104156)
@@ -1,3 +1,15 @@
+2012-01-05 Kenneth Rohde Christiansen <[email protected]>
+
+ [Qt] Implement QQuickWebView::inputMethodQuery
+
+ Reviewed by Simon Hausmann.
+
+ Implement the current Qt5 queries of inputMethodQuery.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebView::inputMethodQuery):
+ * UIProcess/API/qt/qquickwebview_p.h:
+
2012-01-05 Carlos Garcia Campos <[email protected]>
[GTK] Add methods to get/set the WebView zoom level to WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (104155 => 104156)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-01-05 14:57:46 UTC (rev 104155)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-01-05 14:58:36 UTC (rev 104156)
@@ -833,6 +833,32 @@
return d->webPageProxy->pageTitle();
}
+QVariant QQuickWebView::inputMethodQuery(Qt::InputMethodQuery property) const
+{
+ Q_D(const QQuickWebView);
+ const EditorState& state = d->webPageProxy->editorState();
+
+ switch(property) {
+ case Qt::ImCursorRectangle:
+ return QRectF(state.microFocus);
+ case Qt::ImFont:
+ return QVariant();
+ case Qt::ImCursorPosition:
+ return QVariant(static_cast<int>(state.cursorPosition));
+ case Qt::ImAnchorPosition:
+ return QVariant(static_cast<int>(state.anchorPosition));
+ case Qt::ImSurroundingText:
+ return QString(state.surroundingText);
+ case Qt::ImCurrentSelection:
+ return QString(state.selectedText);
+ case Qt::ImMaximumTextLength:
+ return QVariant(); // No limit.
+ default:
+ // Rely on the base implementation for ImEnabled, ImHints and ImPreferredLanguage.
+ return QQuickItem::inputMethodQuery(property);
+ }
+}
+
QQuickWebViewExperimental* QQuickWebView::experimental() const
{
return m_experimental;
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h (104155 => 104156)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2012-01-05 14:57:46 UTC (rev 104155)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h 2012-01-05 14:58:36 UTC (rev 104156)
@@ -87,6 +87,8 @@
bool loading() const;
bool canReload() const;
+ virtual QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
+
QQuickWebPage* page();
QQuickWebViewExperimental* experimental() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
