FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed #386

Browse Source
This commit is contained in:
Martin Rotter 2023-04-21 07:48:26 +02:00
parent fb2c439b40
commit 502e4d88e0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librssguard/gui/webviewers/webengine/webengineviewer.cpp
View File

@ -32,8 +32,6 @@ WebEngineViewer::WebEngineViewer(QWidget* parent) : QWebEngineView(parent), m_br
WebEnginePage* page = new WebEnginePage(this); WebEnginePage* page = new WebEnginePage(this);
setPage(page); setPage(page);
// page->profile()->settings()->setAttribute(QWebEngineSettings::WebAttribute::ScrollAnimatorEnabled, true);
} }
bool WebEngineViewer::event(QEvent* event) { bool WebEngineViewer::event(QEvent* event) {

10
src/librssguard/network-web/webengine/webenginepage.cpp
View File

@ -47,7 +47,15 @@ void WebEnginePage::hideUnwantedElements() {
} }
bool WebEnginePage::acceptNavigationRequest(const QUrl& url, NavigationType type, bool is_main_frame) { bool WebEnginePage::acceptNavigationRequest(const QUrl& url, NavigationType type, bool is_main_frame) {
const RootItem* root = view()->root(); if (type == NavigationType::NavigationTypeLinkClicked) {
bool open_externally_now =
qApp->settings()->value(GROUP(Browser), SETTING(Browser::OpenLinksInExternalBrowserRightAway)).toBool();
if (open_externally_now) {
qApp->web()->openUrlInExternalBrowser(url.toString());
return false;
}
}
if (is_main_frame) { if (is_main_frame) {
auto blocked = qApp->web()->adBlock()->block(AdblockRequestInfo(url)); auto blocked = qApp->web()->adBlock()->block(AdblockRequestInfo(url));