4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI: Split global config into app and user config

Browse source 
This introduces a split of the current single ConfigFile instance for
all configuration into two separate instances.

The app config instance contains system-wide settings that mainly
concern the working of the app itself, whereas the user config instance
contains settings actually exposed to the user for the configuration.
This commit is contained in:
PatTheMav 2024-09-03 16:28:36 +02:00 • committed by Ryan Foster
commit 2635cf3a2a
35 changed files with 1135 additions and 912 deletions
Download patch file Download diff file Expand all files Collapse all files

14
UI/window-basic-preview.cpp
View file

@ -192,17 +192,17 @@ vec3 OBSBasicPreview::GetSnapOffset(const vec3 &tl, const vec3 &br)
vec3_zero(&clampOffset);
const bool snap = config_get_bool(GetGlobalConfig(), "BasicWindow",
const bool snap = config_get_bool(App()->GetUserConfig(), "BasicWindow",
"SnappingEnabled");
if (snap == false)
return clampOffset;
const bool screenSnap = config_get_bool(
GetGlobalConfig(), "BasicWindow", "ScreenSnapping");
App()->GetUserConfig(), "BasicWindow", "ScreenSnapping");
const bool centerSnap = config_get_bool(
GetGlobalConfig(), "BasicWindow", "CenterSnapping");
App()->GetUserConfig(), "BasicWindow", "CenterSnapping");
const float clampDist = config_get_double(GetGlobalConfig(),
const float clampDist = config_get_double(App()->GetUserConfig(),
"BasicWindow",
"SnapDistance") /
main->previewScale;
@ -995,10 +995,10 @@ void OBSBasicPreview::SnapItemMovement(vec2 &offset)
vec3 snapOffset = GetSnapOffset(data.tl, data.br);
const bool snap = config_get_bool(GetGlobalConfig(), "BasicWindow",
const bool snap = config_get_bool(App()->GetUserConfig(), "BasicWindow",
"SnappingEnabled");
const bool sourcesSnap = config_get_bool(
GetGlobalConfig(), "BasicWindow", "SourceSnapping");
App()->GetUserConfig(), "BasicWindow", "SourceSnapping");
if (snap == false)
return;
if (sourcesSnap == false) {
@ -1007,7 +1007,7 @@ void OBSBasicPreview::SnapItemMovement(vec2 &offset)
return;
}
const float clampDist = config_get_double(GetGlobalConfig(),
const float clampDist = config_get_double(App()->GetUserConfig(),
"BasicWindow",
"SnapDistance") /
main->previewScale;