From c8d11a21c648e87f3560042e1c022f031a6e6519 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 21 Mar 2019 11:19:09 +0100 Subject: Fixup focus implementation Follow the other implementation and pass TakeFocus to WebContents Delegate, and hook to our UI from there. Also fixes use of Blur instead of LostFocus, which means we now render unfocused more correctly. Change-Id: I34a1882489bc68b9ff36ed5139af0ee8a3a95b79 Reviewed-by: Alexandru Croitor --- src/webenginewidgets/api/qwebenginepage.cpp | 5 +++-- src/webenginewidgets/api/qwebenginepage_p.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index fae34ae8d..63863ab34 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -522,10 +522,11 @@ void QWebEnginePagePrivate::didPrintPage(quint64 requestId, const QByteArray &re #endif } -void QWebEnginePagePrivate::passOnFocus(bool reverse) +bool QWebEnginePagePrivate::passOnFocus(bool reverse) { if (view) - view->focusNextPrevChild(!reverse); + return view->focusNextPrevChild(!reverse); + return false; } void QWebEnginePagePrivate::authenticationRequired(QSharedPointer controller) diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index a50a1972a..25ed89371 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -126,7 +126,7 @@ public: void didFindText(quint64 requestId, int matchCount) override; void didPrintPage(quint64 requestId, const QByteArray &result) override; void didPrintPageToPdf(const QString &filePath, bool success) override; - void passOnFocus(bool reverse) override; + bool passOnFocus(bool reverse) override; void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID) override; void authenticationRequired(QSharedPointer) override; void releaseProfile() override; -- cgit v1.2.3 From 0d1351132e7b848247fc50343796d22b5dcf1e3b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 25 Mar 2019 16:21:22 +0100 Subject: Fix escaped characters in tooltip Go back to making the tooltip richtext, but set a white-space:pre to keep the tooltip mostly unwrapped. Fixes: QTBUG-74659 Change-Id: I5e30ee0098a608eda969b090355915a75f55405f Reviewed-by: Kai Koehne --- src/webenginewidgets/api/qwebenginepage.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/webenginewidgets') diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 63863ab34..dd720a41b 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1850,9 +1850,11 @@ void QWebEnginePagePrivate::setToolTip(const QString &toolTipText) } // Update tooltip if text was changed. - QString escapedTip = toolTipText.toHtmlEscaped().left(MaxTooltipLength); - if (view->toolTip() != escapedTip) - view->setToolTip(escapedTip); + QString wrappedTip = QLatin1String("

") + % toolTipText.toHtmlEscaped().left(MaxTooltipLength) + % QLatin1String("

"); + if (view->toolTip() != wrappedTip) + view->setToolTip(wrappedTip); } void QWebEnginePagePrivate::printRequested() -- cgit v1.2.3