Differential D12454 Diff 33051 src/articleviewer-ng/webengine/articleviewerwebenginepage.cpp

Changeset View

Standalone View

View Options

src/articleviewer-ng/webengine/articleviewerwebenginepage.cpp

Show All 39 Lines30{
40 settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false); 40​ settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
41 settings()->setAttribute(QWebEngineSettings::HyperlinkAuditingEnabled, false); 41​ settings()->setAttribute(QWebEngineSettings::HyperlinkAuditingEnabled, false);
42 settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false); 42​ settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false);
43 settings()->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false); 43​ settings()->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
44 settings()->setAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled, false); 44​ settings()->setAttribute(QWebEngineSettings::Accelerated2dCanvasEnabled, false);
45 settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false); 45​ settings()->setAttribute(QWebEngineSettings::WebGLEnabled, false);
46 connect(this, &QWebEnginePage::featurePermissionRequested, 46​ connect(this, &QWebEnginePage::featurePermissionRequested,
47 this, &ArticleViewerWebEnginePage::slotFeaturePermissionRequested); 47​ this, &ArticleViewerWebEnginePage::slotFeaturePermissionRequested);
48 connect(this, &QWebEnginePage::urlChanged, 48​ connect(this, &QWebEnginePage::loadProgress,
49 this, &ArticleViewerWebEnginePage::onUrlChanged); 49​ this, &ArticleViewerWebEnginePage::onLoadProgress);
50} 50​}
51 51​
52ArticleViewerWebEnginePage::~ArticleViewerWebEnginePage() 52​ArticleViewerWebEnginePage::~ArticleViewerWebEnginePage()
53{ 53​{
54} 54​}
55 55​
56bool ArticleViewerWebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame) 56​bool ArticleViewerWebEnginePage::acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame)
57{ 57​{
58 Q_UNUSED(type); 58​ Q_UNUSED(type);
59 if (isMainFrame && type == NavigationTypeLinkClicked) { 59​ if (isMainFrame && type == NavigationTypeLinkClicked) {
60 Q_EMIT urlClicked(url); 60​ Q_EMIT urlClicked(url);
61 return false; 61​ return false;
62 } 62​ }
63 return true; 63​ return true;
64} 64​}
65 65​
66void ArticleViewerWebEnginePage::slotFeaturePermissionRequested(const QUrl &url, QWebEnginePage::Feature feature) 66​void ArticleViewerWebEnginePage::slotFeaturePermissionRequested(const QUrl &url, QWebEnginePage::Feature feature)
67{ 67​{
68 //Denied all permissions. 68​ //Denied all permissions.
69 setFeaturePermission(url, feature, QWebEnginePage::PermissionDeniedByUser); 69​ setFeaturePermission(url, feature, QWebEnginePage::PermissionDeniedByUser);
70} 70​}
71 71​
72void ArticleViewerWebEnginePage::onUrlChanged() 72​void ArticleViewerWebEnginePage::onLoadProgress()
73{ 73​{
74 setZoomFactor((double)Settings::zoom() / 100.0); 74​ double newZoom = static_cast<double>(Settings::zoom() / 100.0);
mlaurentUnsubmitted
Done

static_cast<double>(...)

mlaurent: static_cast<double>(...)
75​ if(zoomFactor() != newZoom)
76​ setZoomFactor(newZoom);
75} 77​}