diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2015-02-12 16:20:39 +0000 |
---|---|---|
committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-03-13 08:15:18 +0000 |
commit | 60d8d3dcd2a8337e4038a498f92a97624438b2fb (patch) | |
tree | 98ffec402ae0bc508b255a1159a9b62119a85b2a /src/webenginewidgets/api | |
parent | 5194fe16234cd88dccd763e5d1e497859b7c72b0 (diff) |
Support HTML5 form validation feature
HTML5 provides built-in form validation that is supported by chromium.
The form validation messages should be shown by the browser therefore
new MessageBubble UI element has been added to Quick and Widget
implementations.
This patch implements chromium's form validation events and shows the
messages in a MessageBubble.
Change-Id: I0c8f4f102823117e2bfb16ff8a4c503635491939
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/webenginewidgets/api')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 25 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage_p.h | 3 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 8 |
3 files changed, 36 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 7eab1dc71..65a0a5bed 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -38,6 +38,10 @@ #include "web_contents_adapter.h" #include "web_engine_settings.h" +#ifdef QT_UI_DELEGATES +#include "ui/messagebubblewidget_p.h" +#endif + #include <QAction> #include <QApplication> #include <QAuthenticator> @@ -778,6 +782,27 @@ void QWebEnginePagePrivate::javaScriptConsoleMessage(JavaScriptConsoleMessageLev q->javaScriptConsoleMessage(static_cast<QWebEnginePage::JavaScriptConsoleMessageLevel>(level), message, lineNumber, sourceID); } +void QWebEnginePagePrivate::showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) +{ +#ifdef QT_UI_DELEGATES + QtWebEngineWidgetUI::MessageBubbleWidget::showBubble(view, anchor, mainText, subText); +#endif +} + +void QWebEnginePagePrivate::hideValidationMessage() +{ +#ifdef QT_UI_DELEGATES + QtWebEngineWidgetUI::MessageBubbleWidget::hideBubble(); +#endif +} + +void QWebEnginePagePrivate::moveValidationMessage(const QRect &anchor) +{ +#ifdef QT_UI_DELEGATES + QtWebEngineWidgetUI::MessageBubbleWidget::moveBubble(view, anchor); +#endif +} + namespace { class SaveToClipboardFunctor { diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index 087137a78..8f45ecddf 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -147,6 +147,9 @@ public: #endif // QT_NO_ACCESSIBILITY virtual QtWebEngineCore::WebEngineSettings *webEngineSettings() const Q_DECL_OVERRIDE; virtual void allowCertificateError(const QSharedPointer<CertificateErrorController> &controller) Q_DECL_OVERRIDE; + virtual void showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) Q_DECL_OVERRIDE; + virtual void hideValidationMessage() Q_DECL_OVERRIDE; + virtual void moveValidationMessage(const QRect &anchor) Q_DECL_OVERRIDE; virtual QtWebEngineCore::BrowserContextAdapter *browserContextAdapter() Q_DECL_OVERRIDE; diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 039e18a16..a4a8dd760 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -40,6 +40,10 @@ #include "qwebenginepage_p.h" #include "web_contents_adapter.h" +#ifdef QT_UI_DELEGATES +#include "ui/messagebubblewidget_p.h" +#endif + #include <QAction> #include <QMenu> #include <QContextMenuEvent> @@ -118,6 +122,10 @@ QWebEngineView::~QWebEngineView() { Q_D(QWebEngineView); QWebEngineViewPrivate::bind(0, d->page); + +#ifdef QT_UI_DELEGATES + QtWebEngineWidgetUI::MessageBubbleWidget::hideBubble(); +#endif } QWebEnginePage* QWebEngineView::page() const |