jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "UI: Only apply new scaling behavior on newer installs" 

This reverts commit 4e5f20dcbe.

This originally was added because of a faulty assumption that it would
change defaults, but defaults were apparently broken from 26.0.2 -> 26.1
because primaryScreen->size() changed its behavior, so the original code
technically fixed the original behavior.
master
jp9000 2020-12-29 09:13:37 -08:00
parent 4e5f20dcbe
commit cdd94b2b59
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UI/obs-app.cpp
View File

@ -777,18 +777,6 @@ bool OBSApp::InitGlobalConfig()
} }
#undef PRE_24_1_DEFS #undef PRE_24_1_DEFS
#define PRE_26_2_DEFS "Pre26.2Defaults"
if (!config_has_user_value(globalConfig, "General", PRE_26_2_DEFS)) {
bool useOldDefaults = lastVersion &&
lastVersion <
MAKE_SEMANTIC_VERSION(26, 2, 0);
config_set_bool(globalConfig, "General", PRE_26_2_DEFS,
useOldDefaults);
changed = true;
}
#undef PRE_26_2_DEFS
if (config_has_user_value(globalConfig, "BasicWindow", if (config_has_user_value(globalConfig, "BasicWindow",
"MultiviewLayout")) { "MultiviewLayout")) {
const char *layout = config_get_string( const char *layout = config_get_string(

6
UI/window-basic-main.cpp
View File

@ -1218,11 +1218,6 @@ bool OBSBasic::InitBasicConfigDefaults()
uint32_t cx = primaryScreen->size().width(); uint32_t cx = primaryScreen->size().width();
uint32_t cy = primaryScreen->size().height(); uint32_t cy = primaryScreen->size().height();
bool oldScaleBehavior = config_get_bool(App()->GlobalConfig(),
"General", "Pre26.2Defaults");
/* after version 26.2, apply scaling to cx/cy */
if (!oldScaleBehavior) {
#ifdef SUPPORTS_FRACTIONAL_SCALING #ifdef SUPPORTS_FRACTIONAL_SCALING
cx *= devicePixelRatioF(); cx *= devicePixelRatioF();
cy *= devicePixelRatioF(); cy *= devicePixelRatioF();
@ -1230,7 +1225,6 @@ bool OBSBasic::InitBasicConfigDefaults()
cx *= devicePixelRatio(); cx *= devicePixelRatio();
cy *= devicePixelRatio(); cy *= devicePixelRatio();
#endif #endif
}
bool oldResolutionDefaults = config_get_bool( bool oldResolutionDefaults = config_get_bool(
App()->GlobalConfig(), "General", "Pre19Defaults"); App()->GlobalConfig(), "General", "Pre19Defaults");