mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-18 21:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

frontend: Replace transition duration spinbox direct access

Browse Source
This commit is contained in:
tytan652
2025-02-18 17:25:00 +01:00
committed by Ryan Foster
parent d22ddfd395
commit ffcc3acd9d
5 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/widgets/OBSBasic_SceneCollections.cpp
View File

@@ -886,9 +886,8 @@ void OBSBasic::Save(SceneCollection &collection)
OBSDataArrayAutoRelease quickTrData = SaveQuickTransitions();
OBSDataArrayAutoRelease savedProjectorList = SaveProjectors();
OBSDataArrayAutoRelease savedCanvases = OBS::Canvas::SaveCanvases(canvases);
OBSDataAutoRelease saveData = GenerateSaveData(sceneOrder, quickTrData, ui->transitionDuration->value(),
transitionsData, scene, curProgramScene, savedProjectorList,
savedCanvases);
OBSDataAutoRelease saveData = GenerateSaveData(sceneOrder, quickTrData, transitionDuration, transitionsData,
scene, curProgramScene, savedProjectorList, savedCanvases);
obs_data_set_bool(saveData, "preview_locked", ui->preview->Locked());
obs_data_set_bool(saveData, "scaling_enabled", ui->preview->IsFixedScaling());
@@ -1004,7 +1003,7 @@ void OBSBasic::CreateDefaultScene(bool firstStart)
ClearSceneData();
InitDefaultTransitions();
CreateDefaultQuickTransitions();
ui->transitionDuration->setValue(300);
transitionDuration = 300;
SetTransition(fadeTransition);
updateRemigrationMenuItem(SceneCoordinateMode::Relative, ui->actionRemigrateSceneCollection);
@@ -1304,7 +1303,7 @@ void OBSBasic::LoadData(obs_data_t *data, SceneCollection &collection)
if (!curTransition)
curTransition = fadeTransition;
ui->transitionDuration->setValue(newDuration);
transitionDuration = newDuration;
SetTransition(curTransition);
retryScene: