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

Rework MacroRef

Browse Source 
This should resolve issues of macro names / selections not properly
updating after renaming / grouping / un-grouping macros
This commit is contained in:
WarmUpTill
2023-03-11 23:07:02 +01:00
committed by WarmUpTill
parent 9a4abd78ed
commit e66d0bc6b8
20 changed files with 184 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/utils/macro-list.cpp
View File

@@ -69,17 +69,20 @@ MacroList::MacroList(QWidget *parent, bool allowDuplicates, bool reorder)
void MacroList::SetContent(const std::vector<MacroRef> &macros)
{
for (auto &m : macros) {
QString name;
if (!m.get()) {
name = QString::fromStdString(m.RefName()) + "<" +
obs_module_text(
"AdvSceneSwitcher.macroList.deleted") +
">";
QString listEntryName;
auto macroName = m.Name();
if (macroName.empty()) {
listEntryName = QString::fromStdString(
std::string("<") +
obs_module_text(
"AdvSceneSwitcher.macroList.deleted") +
">");
} else {
name = QString::fromStdString(m->Name());
listEntryName = QString::fromStdString(macroName);
}
QListWidgetItem *item = new QListWidgetItem(name, _list);
item->setData(Qt::UserRole, name);
QListWidgetItem *item =
new QListWidgetItem(listEntryName, _list);
item->setData(Qt::UserRole, listEntryName);
}
SetMacroListSize();
}