From 243a2fef90dc3ac846a36738bfe97efba3050dc9 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 8 Feb 2018 17:31:44 +0100 Subject: Adaptations to form validation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Form validations messages has moved entirely to being done by Blink. Change-Id: I6742c111fc59f0baba75b8b37f5d0ec9ae2fb920 Reviewed-by: Peter Varga Reviewed-by: Michael Brüning --- src/webengine/api/qquickwebengineview.cpp | 44 ------------------------------- 1 file changed, 44 deletions(-) (limited to 'src/webengine/api/qquickwebengineview.cpp') diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 5e11a1c04..2fe146d4c 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -116,7 +116,6 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() , m_fullscreenMode(false) , isLoading(false) , m_activeFocusOnPress(true) - , m_validationShowing(false) , devicePixelRatio(QGuiApplication::primaryScreen()->devicePixelRatio()) , m_webChannel(0) , m_webChannelWorld(0) @@ -995,49 +994,6 @@ void QQuickWebEngineViewPrivate::didPrintPageToPdf(const QString &filePath, bool Q_EMIT q->pdfPrintingFinished(filePath, success); } -void QQuickWebEngineViewPrivate::showValidationMessage(const QRect &anchor, const QString &mainText, const QString &subText) -{ - Q_Q(QQuickWebEngineView); - QQuickWebEngineFormValidationMessageRequest *request; - request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::Show, - anchor,mainText,subText); - m_validationShowing = true; - // mark the object for gc by creating temporary jsvalue - qmlEngine(q)->newQObject(request); - Q_EMIT q->formValidationMessageRequested(request); - if (!request->isAccepted()) - ui()->showMessageBubble(anchor, mainText, subText); -} - -void QQuickWebEngineViewPrivate::hideValidationMessage() -{ - Q_Q(QQuickWebEngineView); - // Suppress the initial hide message before any show messages (Since 61-based) - if (!m_validationShowing) - return; - QQuickWebEngineFormValidationMessageRequest *request; - request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::Hide); - m_validationShowing = false; - // mark the object for gc by creating temporary jsvalue - qmlEngine(q)->newQObject(request); - Q_EMIT q->formValidationMessageRequested(request); - if (!request->isAccepted()) - ui()->hideMessageBubble(); -} - -void QQuickWebEngineViewPrivate::moveValidationMessage(const QRect &anchor) -{ - Q_Q(QQuickWebEngineView); - QQuickWebEngineFormValidationMessageRequest *request; - request = new QQuickWebEngineFormValidationMessageRequest(QQuickWebEngineFormValidationMessageRequest::Move, - anchor); - // mark the object for gc by creating temporary jsvalue - qmlEngine(q)->newQObject(request); - Q_EMIT q->formValidationMessageRequested(request); - if (!request->isAccepted()) - ui()->moveMessageBubble(anchor); -} - void QQuickWebEngineViewPrivate::updateScrollPosition(const QPointF &position) { Q_Q(QQuickWebEngineView); -- cgit v1.2.3