feat(browser): make zoom scaling DPI aware (#1080)

zealdocs · Mar 13, 2019 · b106938 · b106938
1 parent 4bfa75a
commit b106938
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/libs/browser/webview.cpp b/src/libs/browser/webview.cpp
@@ -42,6 +42,8 @@ WebView::WebView(QWidget *parent)
     : QWebView(parent)
 {
     page()->setNetworkAccessManager(Core::Application::instance()->networkManager());
+    // Applies any DPI based scaling.
+    setZoomLevel(defaultZoomLevel());
 }
 
 int WebView::zoomLevel() const
@@ -60,7 +62,10 @@ void WebView::setZoomLevel(int level)
 
     m_zoomLevel = level;
 
-    setZoomFactor(availableZoomLevels().at(level) / 100.0);
+    // Scale the webview relative to the DPI of the screen.
+    const float dpiZoomFactor = logicalDpiY() / 96.0;
+
+    setZoomFactor(availableZoomLevels().at(level) / 100.0 * dpiZoomFactor);
     emit zoomLevelChanged();
 }
 
@@ -72,7 +77,7 @@ const QVector<int> &WebView::availableZoomLevels()
     return zoomLevels;
 }
 
-const int &WebView::defaultZoomLevel()
+int WebView::defaultZoomLevel()
 {
     static const int level = availableZoomLevels().indexOf(100);
     return level;

diff --git a/src/libs/browser/webview.h b/src/libs/browser/webview.h
@@ -42,7 +42,7 @@ class WebView final : public QWebView
     void setZoomLevel(int level);
 
     static const QVector<int> &availableZoomLevels();
-    static const int &defaultZoomLevel();
+    static int defaultZoomLevel();
 
 public slots:
     void zoomIn();
@@ -66,7 +66,7 @@ public slots:
 
     QMenu *m_contextMenu = nullptr;
     QUrl m_clickedLink;
-    int m_zoomLevel = defaultZoomLevel();
+    int m_zoomLevel = 0;
 };
 
 } // namespace Browser