summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2024-06-20 21:40:53 +0200
committerNicolas Werner <nicolas.werner@hotmail.de>2024-06-20 21:40:53 +0200
commit311d9ad31e89fb023eb3638d446774f3a9d06281 (patch)
tree4455337eab960dda0476261aa11b77b5b6d2151d
parenta486d8d7fc567c191e7259b478b6f03b3800ac4a (diff)
Allow setting a scale factor on Windows
Fixes #1756
-rw-r--r--src/UserSettingsPage.cpp3
-rw-r--r--src/main.cpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 49fb6a59..4f208d22 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -1420,7 +1420,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
return tr("Will prevent swipe motions like swiping left/right between Rooms and "
"Timeline, or swiping a message to reply.");
case ScaleFactor:
- return tr("Change the scale factor of the whole user interface.");
+ return tr("Change the scale factor of the whole user interface. Requires a restart to "
+ "take effect.");
case UseStunServer:
return tr(
"Will use turn.matrix.org as assist when your home server does not offer one.");
diff --git a/src/main.cpp b/src/main.cpp
index 392867bb..bdfb84e7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -169,7 +169,7 @@ main(int argc, char *argv[])
// this needs to be after setting the application name. Or how would we find our settings
// file then?
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
+#if !defined(Q_OS_MACOS)
if (qgetenv("QT_SCALE_FACTOR").size() == 0) {
float factor = utils::scaleFactor();