Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set zoom factor after page has finished loading #774

Merged
merged 1 commit into from
Feb 25, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/webview.cpp
Original file line number Diff line number Diff line change
@@ -40,6 +40,29 @@ void WebViewForwardMenu::showEvent(QShowEvent *)
setGeometry(geo);
}

QString getZimIdFromUrl(QUrl url)
{
return url.host().split('.')[0];
}

QString getResultTypeFromUrl(QUrl url)
{
return url.host().split('.')[1];
}

void WebView::applyCorrectZoomFactor() {
auto url = this->url();
auto settingsManager = KiwixApp::instance()->getSettingsManager();
qreal zoomFactor;
const bool isSearchResultsView = QUrlQuery(url).hasQueryItem("pattern") && (getResultTypeFromUrl(url) == "search");
if (isSearchResultsView) {
zoomFactor = settingsManager->getZoomFactor();
} else {
auto zimId = getZimIdFromUrl(url);
zoomFactor = settingsManager->getZoomFactorByZimId(zimId);
}
this->setZoomFactor(zoomFactor);
}

WebView::WebView(QWidget *parent)
: QWebEngineView(parent)
@@ -49,6 +72,18 @@ WebView::WebView(QWidget *parent)
connect(this->page(), &QWebEnginePage::linkHovered, this, [=] (const QString& url) {
m_linkHovered = url;
});

/* In Qt 5.12, the zoom factor is not correctly passed after a fulltext search
* Bug Report: https://bugreports.qt.io/browse/QTBUG-51851
* This rezooms the page to its correct zoom (default/by ZIM ID) after loading is finished.
* If the page is search results, we put the default zoom factor
* If in Qt 6.x, the bug is fixed this code can be removed.
*/
connect(this, &QWebEngineView::loadFinished, this, [=] (bool ok) {
if (ok) {
applyCorrectZoomFactor();
}
});
}

WebView::~WebView()
@@ -125,7 +160,7 @@ QWebEngineView* WebView::createWindow(QWebEnginePage::WebWindowType type)
}

void WebView::onUrlChanged(const QUrl& url) {
auto zimId = url.host().split('.')[0];
auto zimId = getZimIdFromUrl(url);
if (m_currentZimId == zimId ) {
return;
}
1 change: 1 addition & 0 deletions src/webview.h
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ private slots:

private:
void addHistoryItemAction(QMenu *menu, const QWebEngineHistoryItem &item, int n) const;
void applyCorrectZoomFactor();
};

#endif // WEBVIEW_H