Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-09-07 00:56:00 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust to SceneItemSelection rework

Browse Source 
And do minor cleanup
This commit is contained in:
WarmUpTill
2023-07-16 20:29:21 +02:00
committed by WarmUpTill
parent a82bce947f
commit 884fb1b637
14 changed files with 107 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/macro-core/macro-action-scene-transform.cpp
View File

@@ -235,6 +235,7 @@ void MacroActionSceneTransform::Transform(obs_scene_item *item)
center(item, CenterType::HORIZONTAL);
break;
case MacroActionSceneTransform::Action::MANUAL_TRANSFORM:
ApplySettings(_settings); // Resolves variables
obs_sceneitem_defer_update_begin(item);
obs_sceneitem_set_info(item, &_info);
obs_sceneitem_set_crop(item, &_crop);
@@ -245,12 +246,9 @@ void MacroActionSceneTransform::Transform(obs_scene_item *item)
bool MacroActionSceneTransform::PerformAction()
{
ApplySettings(_settings); // Resolves variables
auto items = _source.GetSceneItems(_scene);
for (auto &item : items) {
for (const auto &item : items) {
Transform(item);
obs_sceneitem_release(item);
}
return true;
}
@@ -345,9 +343,6 @@ void MacroActionSceneTransform::ApplySettings(const std::string &settings)
}
obs_data_release(obj);
}
for (auto item : items) {
obs_sceneitem_release(item);
}
obs_data_release(data);
}
@@ -455,6 +450,8 @@ void MacroActionSceneTransformEdit::SourceChanged(const SceneItemSelection &item
_entryData->_source = item;
emit HeaderInfoChanged(
QString::fromStdString(_entryData->GetShortDesc()));
adjustSize();
updateGeometry();
}
void MacroActionSceneTransformEdit::ActionChanged(int idx)
@@ -492,9 +489,6 @@ void MacroActionSceneTransformEdit::GetSettingsClicked()
auto settings = GetSceneItemTransform(items[0]);
_settings->setPlainText(FormatJsonString(settings));
for (auto item : items) {
obs_sceneitem_release(item);
}
}
void MacroActionSceneTransformEdit::SettingsChanged()