OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-07 03:53:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Remove disable_high_dpi_scaling option on Qt 6

Browse source 
With Qt 6, high dpi scaling is always enabled and the
AA_DisableHighDpiScaling becomes no-op. As such, the command line
argument can get removed.
This commit is contained in:
gxalpha 2022-07-18 18:35:53 +02:00 committed by Ryan Foster
parent 0a218e06b7
commit 80e2a980bf
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
UI/obs-app.cpp
View file

@ -88,7 +88,9 @@ bool opt_start_virtualcam = false;
bool opt_minimize_tray = false;
bool opt_allow_opengl = false;
bool opt_always_on_top = false;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
bool opt_disable_high_dpi_scaling = false;
#endif
bool opt_disable_updater = false;
bool opt_disable_missing_files_check = false;
string opt_starting_collection;
@ -2053,7 +2055,8 @@ static int run_program(fstream &logFile, int argc, char *argv[])
ScopeProfiler prof{run_program_init};
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)) && \
(QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
QGuiApplication::setAttribute(opt_disable_high_dpi_scaling
? Qt::AA_DisableHighDpiScaling
: Qt::AA_EnableHighDpiScaling);
@ -2847,10 +2850,11 @@ int main(int argc, char *argv[])
nullptr)) {
opt_disable_missing_files_check = true;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
} else if (arg_is(argv[i], "--disable-high-dpi-scaling",
nullptr)) {
opt_disable_high_dpi_scaling = true;
#endif
} else if (arg_is(argv[i], "--help", "-h")) {
std::string help =
"--help, -h: Get list of available commands.\n\n"
@ -2871,7 +2875,10 @@ int main(int argc, char *argv[])
"--unfiltered_log: Make log unfiltered.\n\n"
"--disable-updater: Disable built-in updater (Windows/Mac only)\n\n"
"--disable-missing-files-check: Disable the missing files dialog which can appear on startup.\n\n"
"--disable-high-dpi-scaling: Disable automatic high-DPI scaling\n\n";
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
"--disable-high-dpi-scaling: Disable automatic high-DPI scaling\n\n"
#endif
;
#ifdef _WIN32
MessageBoxA(NULL, help.c_str(), "Help",

2
UI/obs-app.hpp
View file

@ -240,6 +240,8 @@ extern bool opt_minimize_tray;
extern bool opt_studio_mode;
extern bool opt_allow_opengl;
extern bool opt_always_on_top;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
extern bool opt_disable_high_dpi_scaling;
#endif
extern std::string opt_starting_scene;
extern bool restart;