flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-03 07:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

[5.14.1] UI adjustments

Browse Source 
* OS native check of screen resolution (Qt free, experimental)
* changed rounding
* use string for scale factor so we can use fractions as 2/3
* utility functions to clean numbers, parse fractions

It looks like:

* my WIN10 scaling is 250%
* obviously swift rounds that to 3 (device ratio)
* now using FLOOR policy down-rounding to 2
* rational: scaling up (scale factor) is better as down-scaling as the factors would be clearer
* 2->3 1.5, but 3->2 means 0.66667
This commit is contained in:
Klaus Basan
2020-02-08 00:13:54 +01:00
committed by Mat Sutcliffe
parent 52de67a72f
commit 8f4c4a249c
13 changed files with 232 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/blackgui/guiapplication.cpp
View File

@@ -66,6 +66,7 @@
#include <QMessageBox>
#include <QtGlobal>
#include <QWhatsThis>
#include <Qt>
using namespace BlackConfig;
using namespace BlackMisc;
@@ -351,21 +352,27 @@ namespace BlackGui
CApplication::exit(retcode);
}
void CGuiApplication::highDpiScreenSupport(double scaleFactor)
void CGuiApplication::highDpiScreenSupport(const QString &scaleFactor)
{
// https://lists.qt-project.org/pipermail/development/2019-September/037434.html
if (scaleFactor < 0)
// QSize s = CGuiUtility::physicalScreenSizeOs();
QString sf = scaleFactor.trimmed().isEmpty() ? defaultScaleFactorString() : scaleFactor;
if (sf.contains('/'))
{
// qputenv("QT_AUTO_SCREEN_SCALE_FACTOR", "1"); // until 5.14
qputenv("QT_ENABLE_HIGHDPI_SCALING", "1");
}
else
{
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); // HiDPI pixmaps
const QString sf = QString::number(scaleFactor, 'f', 2);
qputenv("QT_SCALE_FACTOR", sf.toLatin1());
const double sfd = parseFraction(scaleFactor, -1);
sf = sfd < 0 ? "1.0" : QString::number(sfd, 'f', 8);
}
sf = cleanNumber(sf);
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); // HiDPI pixmaps
// qputenv("QT_ENABLE_HIGHDPI_SCALING", "1");
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::Floor);
const QByteArray sfa = sf.toLatin1();
qputenv("QT_SCALE_FACTOR", sfa);
}
bool CGuiApplication::isUsingHighDpiScreenSupport()
@@ -375,7 +382,7 @@ namespace BlackGui
QScreen *CGuiApplication::currentScreen()
{
QWidget *w = CGuiApplication::mainApplicationWidget();
const QWidget *w = CGuiApplication::mainApplicationWidget();
const int s = QApplication::desktop()->screenNumber(w);
if (s < QGuiApplication::screens().size()) { return QGuiApplication::screens()[s]; }
return QGuiApplication::primaryScreen();
@@ -552,6 +559,37 @@ namespace BlackGui
return -1.0;
}
QString CGuiApplication::scaleFactor(int argc, char *argv[])
{
for (int i = 1; i < argc; ++i)
{
if (qstrcmp(argv[i], "--scale") == 0 || qstrcmp(argv[i], "-scale") == 0)
{
if (i + 1 >= argc) { return QString(); } // no value
const QString factor(argv[i + 1]);
return factor.trimmed();
}
}
return QString();
}
QString CGuiApplication::defaultScaleFactorString()
{
if (!CBuildConfig::isRunningOnWindowsNtPlatform()) { return "1.0"; }
// On windows
// Qt 5.14.1 default is device ratio 3
// Qt 5.14.0 default device ratio was 2
// 2/3 (0.66667) => device ratio 3
// 0.75 => device ratio 2.25
// 0.8 => device ratio 2.4
// 1.00 => device ratio 3
// currently NOT used
return "1.0";
}
bool CGuiApplication::cmdLineErrorMessage(const QString &errorMessage, bool retry) const
{
const QString helpText(beautifyHelpMessage(m_parser.helpText()));