diff --git a/src/librssguard/gui/webbrowser.h b/src/librssguard/gui/webbrowser.h index 62cf6b93f..54134435d 100644 --- a/src/librssguard/gui/webbrowser.h +++ b/src/librssguard/gui/webbrowser.h @@ -84,6 +84,7 @@ class RSSGUARD_DLLSPEC WebBrowser : public TabContent { signals: void windowCloseRequested(); + void iconChanged(int index, const QIcon& icon); void titleChanged(int index, const QString& title); diff --git a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp index 0c15d7a26..0e72df63e 100644 --- a/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.cpp @@ -33,6 +33,8 @@ WebEngineViewer::WebEngineViewer(QWidget* parent) : QWebEngineView(parent), m_br WebEnginePage* page = new WebEnginePage(this); setPage(page); + + connect(page, &WebEnginePage::fullScreenRequested, this, &WebEngineViewer::onFullScreenRequested); } bool WebEngineViewer::event(QEvent* event) { @@ -48,6 +50,10 @@ bool WebEngineViewer::event(QEvent* event) { return QWebEngineView::event(event); } +void WebEngineViewer::onFullScreenRequested(QWebEngineFullScreenRequest request) { + request.accept(); +} + WebEnginePage* WebEngineViewer::page() const { return qobject_cast(QWebEngineView::page()); } @@ -178,10 +184,10 @@ void WebEngineViewer::setVerticalScrollBarPosition(double pos) { void WebEngineViewer::applyFont(const QFont& fon) { auto pixel_size = QFontMetrics(fon).ascent(); - qApp->web()->engineProfile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::StandardFont, fon.family()); - qApp->web()->engineProfile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::SerifFont, fon.family()); - qApp->web()->engineProfile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::SansSerifFont, fon.family()); - qApp->web()->engineProfile()->settings()->setFontSize(QWebEngineSettings::DefaultFontSize, pixel_size); + page()->profile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::StandardFont, fon.family()); + page()->profile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::SerifFont, fon.family()); + page()->profile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::SansSerifFont, fon.family()); + page()->profile()->settings()->setFontSize(QWebEngineSettings::DefaultFontSize, pixel_size); } qreal WebEngineViewer::zoomFactor() const { diff --git a/src/librssguard/gui/webviewers/webengine/webengineviewer.h b/src/librssguard/gui/webviewers/webengine/webengineviewer.h index 5ac4b591f..530b37552 100644 --- a/src/librssguard/gui/webviewers/webengine/webengineviewer.h +++ b/src/librssguard/gui/webviewers/webengine/webengineviewer.h @@ -8,6 +8,7 @@ #include "miscellaneous/externaltool.h" #include "network-web/webengine/webenginepage.h" +#include #include class RootItem; @@ -57,6 +58,7 @@ class RSSGUARD_DLLSPEC WebEngineViewer : public QWebEngineView, public WebViewer virtual bool event(QEvent* event); private slots: + void onFullScreenRequested(QWebEngineFullScreenRequest request); void openUrlWithExternalTool(ExternalTool tool, const QString& target_url); private: