Add DPI logging

And related settings

Author: iakov

qrgui/mainWindow/main.cpp

@@ -73,7 +73,7 @@ static QString versionInfo()
 
 int main(int argc, char *argv[])
 {
-	PlatformInfo::enableHiDPISupport();
+	const auto &dpiInfo = PlatformInfo::enableHiDPISupport();
 	QScopedPointer<QRealApplication> app(new QRealApplication(argc, argv));
 
 	if (app->arguments().contains("--clear-conf")) {
@@ -124,6 +124,7 @@ int main(int argc, char *argv[])
 				<< "/ Kernel: " << QSysInfo::kernelType() << QSysInfo::kernelVersion();
 	QLOG_INFO() << "Arguments:" << app->arguments();
 	QLOG_INFO() << "Setting default locale to" << QLocale().name();
+	for (auto &&i: dpiInfo) { QLOG_INFO() << i ; }
 
 	QApplication::setStyle(QStyleFactory::create("Fusion"));
 

qrgui/mainWindow/mainWindow.cpp

@@ -114,6 +114,7 @@ MainWindow::MainWindow(const QString &fileToOpen)
 	, mSceneCustomizer(new SceneCustomizer())
 	, mInitialFileToOpen(fileToOpen)
 {
+	QLOG_INFO() << "MainWindow: screen DPI is" << logicalDpiX();
 	mUi->setupUi(this);
 	mUi->paletteTree->initMainWindow(this);
 	setWindowTitle("QReal");

qrkernel/platformInfo.cpp

@@ -119,13 +119,25 @@ bool PlatformInfo::isX64()
 	return cpuArchitecture().contains("64");
 }
 
-void PlatformInfo::enableHiDPISupport()
+QStringList PlatformInfo::enableHiDPISupport()
 {
-	if (!qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO")
-			&& !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR")
-			&& !qEnvironmentVariableIsSet("QT_SCALE_FACTOR")
-			&& !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) {
-		// Only if there is no attempt to set from the system environment	
-			QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+	static const QList<const char*> envVars { "QT_DEVICE_PIXEL_RATIO"
+									   , "QT_AUTO_SCREEN_SCALE_FACTOR"
+									   , "QT_SCALE_FACTOR"
+									   , "QT_SCREEN_SCALE_FACTORS"
+									 };
+	bool anyIsSet = false;
+	QStringList result;
+	for (auto &&e: envVars) {
+		if (qEnvironmentVariableIsSet(e)) {
+			result << QString("Scaling variable %1=%2").arg(e, qEnvironmentVariable(e));
+			anyIsSet = true;
+		}
+	}
+	if (!anyIsSet) {
+		// Only if there is no attempt to set from the system environment
+		QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+		result << "Using Qt::AA_EnableHighDpiScaling";
 	}
+	return result;
 }

qrkernel/platformInfo.h

@@ -15,6 +15,7 @@
 #pragma once
 
 #include <qrkernel/kernelDeclSpec.h>
+#include <QStringList>
 
 namespace qReal {
 
@@ -49,8 +50,8 @@ class QRKERNEL_EXPORT PlatformInfo
 	/// Returns true if current OS and process architecture reported by currentCpuArchitecture contains '64'.
 	static bool isX64();
 
-	/// Designed to make an attempt to set proper flags for HiDPI screens
-	static void enableHiDPISupport();
+	/// Designed to make an attempt to set proper flags for HiDPI screens, returns info for logging
+	static QStringList enableHiDPISupport();
 };
 
 }