From af9107671875e893a822784528ebed71a5e733fb Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Tue, 14 Mar 2017 18:03:14 +0000 Subject: [PATCH] Hi-DPI Support - LTM Data Table .. font sizes ala changes prior for RideSummary --- src/Charts/LTMWindow.cpp | 9 ++++++++- src/Charts/RideSummaryWindow.cpp | 5 ++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Charts/LTMWindow.cpp b/src/Charts/LTMWindow.cpp index 90432d1bc3..477cae3037 100644 --- a/src/Charts/LTMWindow.cpp +++ b/src/Charts/LTMWindow.cpp @@ -34,6 +34,7 @@ #ifdef NOWEBKIT #include +#include #endif #include @@ -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 index 2b8d94d035..e6232581cb 100644 --- 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 {