Hi-DPI Support - LTM Data Table

.. font sizes ala changes prior for RideSummary
GoldenCheetah · Mar 14, 2017 · af91076 · af91076
1 parent 62ec397
commit af91076
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/Charts/LTMWindow.cpp b/src/Charts/LTMWindow.cpp
@@ -34,6 +34,7 @@
 
 #ifdef NOWEBKIT
 #include <QWebEngineSettings>
+#include <QDesktopWidget>
 #endif
 
 #include <QtGui>
@@ -142,7 +143,13 @@ LTMWindow::LTMWindow(Context *context) :
 #ifdef NOWEBKIT
     dataSummary = new QWebEngineView(this);
     //XXXdataSummary->setEnabled(false); // stop grabbing focus
-    dataSummary->settings()->setFontSize(QWebEngineSettings::DefaultFontSize, defaultFont.pointSize()+1);
+    if (dpiXFactor > 1) {
+    // 80 lines per page on hidpi screens (?)
+        int pixelsize = pixelSizeForFont(defaultFont, QApplication::desktop()->geometry().height()/80);
+        dataSummary->settings()->setFontSize(QWebEngineSettings::DefaultFontSize, pixelsize);
+    } else {
+        dataSummary->settings()->setFontSize(QWebEngineSettings::DefaultFontSize, defaultFont.pointSize()+1);
+    }
     dataSummary->settings()->setFontFamily(QWebEngineSettings::StandardFont, defaultFont.family());
 #else
     dataSummary = new QWebView(this);

diff --git a/src/Charts/RideSummaryWindow.cpp b/src/Charts/RideSummaryWindow.cpp
@@ -168,9 +168,8 @@ RideSummaryWindow::configChanged(qint32)
     // font size is in pixels, if not hidpi leave as before
     if (dpiXFactor > 1) {
 
-        // 60 lines per page on hidpi screens (?)
-        QFont p;
-        int pixelsize = pixelSizeForFont(p, QApplication::desktop()->geometry().height()/80);
+        // 80 lines per page on hidpi screens (?)
+        QFont p; int pixelsize = pixelSizeForFont(p, QApplication::desktop()->geometry().height()/80);
         rideSummary->settings()->setFontSize(QWebEngineSettings::DefaultFontSize, pixelsize);
 
     } else {