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

Enable grouping of macros

Browse Source 
Based on OBS's source-tree model/view implementation
This commit is contained in:
WarmUpTill
2022-12-31 15:41:01 +01:00
committed by WarmUpTill
parent 2116bd7a78
commit a80af327d7
14 changed files with 1653 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/macro-core/macro-condition-edit.cpp
View File

@@ -380,7 +380,7 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
logic = macro->Conditions().at(idx - 1)->GetLogicType();
}
} else {
MacroConditionScene temp(macro);
MacroConditionScene temp(macro.get());
id = temp.GetId();
logic = LogicType::ROOT_NONE;
}
@@ -388,7 +388,7 @@ void AdvSceneSwitcher::AddMacroCondition(int idx)
std::lock_guard<std::mutex> lock(switcher->m);
auto cond = macro->Conditions().emplace(
macro->Conditions().begin() + idx,
MacroConditionFactory::Create(id, macro));
MacroConditionFactory::Create(id, macro.get()));
if (idx - 1 >= 0) {
auto data = obs_data_create();
macro->Conditions().at(idx - 1)->Save(data);
@@ -535,7 +535,7 @@ void AdvSceneSwitcher::MoveMacroConditionUp(int idx)
return;
}
SwapConditions(macro, idx, idx - 1);
SwapConditions(macro.get(), idx, idx - 1);
HighlightCondition(idx - 1);
}
@@ -550,7 +550,7 @@ void AdvSceneSwitcher::MoveMacroConditionDown(int idx)
return;
}
SwapConditions(macro, idx, idx + 1);
SwapConditions(macro.get(), idx, idx + 1);
HighlightCondition(idx + 1);
}