Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-15 14:16:25 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Adjust to section widget rework

Browse Source
This commit is contained in:
WarmUpTill 2021-05-27 21:00:17 +02:00 committed by WarmUpTill
parent bf03edd391
commit 86d4e59dc2
4 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/headers/macro-action-edit.hpp
View File

@ -40,8 +40,7 @@ public:
std::shared_ptr<MacroAction> * = nullptr,
const std::string &id = "scene_switch",
bool startCollapsed = false);
void UpdateEntryData(const std::string &id);
void Collapse(bool collapsed);
void UpdateEntryData(const std::string &id, bool collapse);
private slots:
void ActionSelectionChanged(const QString &text);

3
src/headers/macro-condition-edit.hpp
View File

@ -41,8 +41,7 @@ public:
const std::string &id = "scene", bool root = true,
bool startCollapsed = false);
bool IsRootNode();
void UpdateEntryData(const std::string &id);
void Collapse(bool collapsed);
void UpdateEntryData(const std::string &id, bool collapse);
private slots:
void LogicSelectionChanged(int idx);

19
src/macro-action-edit.cpp
View File

@ -78,10 +78,9 @@ MacroActionEdit::MacroActionEdit(QWidget *parent,
setLayout(mainLayout);
_entryData = entryData;
UpdateEntryData(id);
UpdateEntryData(id, startCollapsed);
_loading = false;
_section->Collapse(startCollapsed);
}
void MacroActionEdit::ActionSelectionChanged(const QString &text)
@ -97,22 +96,16 @@ void MacroActionEdit::ActionSelectionChanged(const QString &text)
*_entryData = MacroActionFactory::Create(id);
auto widget =
MacroActionFactory::CreateWidget(id, window(), *_entryData);
_section->SetContent(widget);
_section->Collapse(false);
_section->SetContent(widget, false);
}
void MacroActionEdit::UpdateEntryData(const std::string &id)
void MacroActionEdit::UpdateEntryData(const std::string &id, bool collapse)
{
_actionSelection->setCurrentText(
obs_module_text(MacroActionFactory::GetActionName(id).c_str()));
auto widget =
MacroActionFactory::CreateWidget(id, window(), *_entryData);
_section->SetContent(widget);
}
void MacroActionEdit::Collapse(bool collapsed)
{
_section->Collapse(collapsed);
_section->SetContent(widget, collapse);
}
void AdvSceneSwitcher::on_actionAdd_clicked()
@ -127,10 +120,10 @@ void AdvSceneSwitcher::on_actionAdd_clicked()
std::lock_guard<std::mutex> lock(switcher->m);
macro->Actions().emplace_back(MacroActionFactory::Create(id));
auto newEntry = new MacroActionEdit(this, &macro->Actions().back(), id);
auto newEntry =
new MacroActionEdit(this, &macro->Actions().back(), id, false);
ui->macroEditActionLayout->addWidget(newEntry);
ui->macroEditActionHelp->setVisible(false);
newEntry->Collapse(false);
}
void AdvSceneSwitcher::on_actionRemove_clicked()

18
src/macro-condition-edit.cpp
View File

@ -104,9 +104,8 @@ MacroConditionEdit::MacroConditionEdit(
_entryData = entryData;
_isRoot = root;
UpdateEntryData(id);
UpdateEntryData(id, startCollapsed);
_loading = false;
_section->Collapse(startCollapsed);
}
void MacroConditionEdit::LogicSelectionChanged(int idx)
@ -131,7 +130,7 @@ bool MacroConditionEdit::IsRootNode()
return _isRoot;
}
void MacroConditionEdit::UpdateEntryData(const std::string &id)
void MacroConditionEdit::UpdateEntryData(const std::string &id, bool collapse)
{
_conditionSelection->setCurrentText(obs_module_text(
MacroConditionFactory::GetConditionName(id).c_str()));
@ -144,12 +143,7 @@ void MacroConditionEdit::UpdateEntryData(const std::string &id)
_logicSelection->setCurrentIndex(static_cast<int>(logic) -
logic_root_offset);
}
_section->SetContent(widget);
}
void MacroConditionEdit::Collapse(bool collapsed)
{
_section->Collapse(collapsed);
_section->SetContent(widget, collapse);
}
void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
@ -167,8 +161,7 @@ void MacroConditionEdit::ConditionSelectionChanged(const QString &text)
(*_entryData)->SetLogicType(logic);
auto widget =
MacroConditionFactory::CreateWidget(id, window(), *_entryData);
_section->SetContent(widget);
_section->Collapse(false);
_section->SetContent(widget, false);
}
void AdvSceneSwitcher::on_conditionAdd_clicked()
@ -186,10 +179,9 @@ void AdvSceneSwitcher::on_conditionAdd_clicked()
auto logic = root ? LogicType::ROOT_NONE : LogicType::NONE;
macro->Conditions().back()->SetLogicType(logic);
auto newEntry = new MacroConditionEdit(
this, &macro->Conditions().back(), id, root);
this, &macro->Conditions().back(), id, root, false);
ui->macroEditConditionLayout->addWidget(newEntry);
ui->macroEditConditionHelp->setVisible(false);
newEntry->Collapse(false);
}
void AdvSceneSwitcher::on_conditionRemove_clicked()