feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Move defaultHighDpiScaleFactorRoundingPolicy() to StyleHelper

Browse Source 
... from HostOSInfo. A better suited place.

Amends: 3726f0d6c1

Change-Id: I5ba052603ae438b9347f1091088f0d105d19f587
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Alessandro Portale
2023-10-04 17:41:42 +02:00
parent 257af1ebd8
commit 64870f9163
5 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/main.cpp
View File

@@ -19,6 +19,7 @@
#include <utils/hostosinfo.h>
#include <utils/qtcsettings.h>
#include <utils/singleton.h>
#include <utils/stylehelper.h>
#include <utils/temporarydirectory.h>
#include <utils/terminalcommand.h>
@@ -286,7 +287,7 @@ static void setHighDpiEnvironmentVariable()
std::unique_ptr<Utils::QtcSettings> settings(createUserSettings());
using Policy = Qt::HighDpiScaleFactorRoundingPolicy;
const Policy defaultPolicy = Utils::HostOsInfo::defaultHighDpiScaleFactorRoundingPolicy();
const Policy defaultPolicy = Utils::StyleHelper::defaultHighDpiScaleFactorRoundingPolicy();
const Policy userPolicy = settings->value("Core/HighDpiScaleFactorRoundingPolicy",
int(defaultPolicy)).value<Policy>();
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(userPolicy);

6
src/libs/utils/hostosinfo.h
View File

@@ -90,12 +90,6 @@ public:
static const FilePath &root();
static constexpr Qt::HighDpiScaleFactorRoundingPolicy
defaultHighDpiScaleFactorRoundingPolicy() {
return isMacHost() ? Qt::HighDpiScaleFactorRoundingPolicy::Unset
: Qt::HighDpiScaleFactorRoundingPolicy::PassThrough;
}
private:
static Qt::CaseSensitivity m_overrideFileNameCaseSensitivity;
static bool m_useOverrideFileNameCaseSensitivity;

6
src/libs/utils/stylehelper.cpp
View File

@@ -712,6 +712,12 @@ bool StyleHelper::isQDSTheme()
return creatorTheme() ? creatorTheme()->flag(Theme::QDSTheme) : false;
}
Qt::HighDpiScaleFactorRoundingPolicy StyleHelper::defaultHighDpiScaleFactorRoundingPolicy()
{
return HostOsInfo::isMacHost() ? Qt::HighDpiScaleFactorRoundingPolicy::Unset
: Qt::HighDpiScaleFactorRoundingPolicy::PassThrough;
}
QIcon StyleHelper::getIconFromIconFont(const QString &fontName, const QList<IconFontHelper> &parameters)
{
QFontDatabase a;

3
src/libs/utils/stylehelper.h
View File

@@ -107,6 +107,9 @@ QTCREATOR_UTILS_EXPORT void setPanelWidgetSingleRow(QWidget *widget, bool value
QTCREATOR_UTILS_EXPORT bool isQDSTheme();
QTCREATOR_UTILS_EXPORT
Qt::HighDpiScaleFactorRoundingPolicy defaultHighDpiScaleFactorRoundingPolicy();
class IconFontHelper
{
public:

4
src/plugins/coreplugin/generalsettings.cpp
View File

@@ -148,7 +148,7 @@ GeneralSettingsWidget::GeneralSettingsWidget()
const Policy userPolicy =
ICore::settings()->value(settingsKeyDpiPolicy,
int(HostOsInfo::defaultHighDpiScaleFactorRoundingPolicy()))
int(StyleHelper::defaultHighDpiScaleFactorRoundingPolicy()))
.value<Policy>();
m_policyComboBox->setCurrentIndex(m_policyComboBox->findData(int(userPolicy)));
@@ -343,7 +343,7 @@ void GeneralSettingsWidget::setDpiPolicy(Qt::HighDpiScaleFactorRoundingPolicy po
dialog.exec();
}
settings->setValueWithDefault(settingsKeyDpiPolicy, int(policy),
int(HostOsInfo::defaultHighDpiScaleFactorRoundingPolicy()));
int(StyleHelper::defaultHighDpiScaleFactorRoundingPolicy()));
}
void GeneralSettings::applyToolbarStyleFromSettings()