Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-13 20:58:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rework SourceSelectionWidget to support widget caching

Browse Source
This commit is contained in:
WarmUpTill
2025-05-20 21:37:18 +02:00
committed by WarmUpTill
parent 3dd3f576c3
commit ba3e87a761
15 changed files with 125 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/utils/source-selection.cpp
View File

@@ -164,7 +164,7 @@ void SourceSelectionWidget::PopulateSelection()
}
_variablesEndIdx = count();
AddSelectionGroup(this, _sourceNames);
AddSelectionGroup(this, _populateSourcesCallback());
_sourcesEndIdx = count();
// Remove last separator
@@ -172,13 +172,13 @@ void SourceSelectionWidget::PopulateSelection()
setCurrentIndex(-1);
}
SourceSelectionWidget::SourceSelectionWidget(QWidget *parent,
const QStringList &sourceNames,
bool addVariables)
SourceSelectionWidget::SourceSelectionWidget(
QWidget *parent, const std::function<QStringList()> &populate,
bool addVariables)
: FilterComboBox(parent,
obs_module_text("AdvSceneSwitcher.selectSource")),
_addVariables(addVariables),
_sourceNames(sourceNames)
_populateSourcesCallback(populate)
{
setDuplicatesEnabled(true);
PopulateSelection();
@@ -200,6 +200,11 @@ SourceSelectionWidget::SourceSelectionWidget(QWidget *parent,
void SourceSelectionWidget::SetSource(const SourceSelection &s)
{
{
const QSignalBlocker b(this);
PopulateSelection();
}
int idx = -1;
switch (s.GetType()) {
@@ -229,23 +234,23 @@ void SourceSelectionWidget::SetSource(const SourceSelection &s)
_currentSelection = s;
}
void SourceSelectionWidget::SetSourceNameList(const QStringList &list)
{
_sourceNames = list;
Reset();
}
void SourceSelectionWidget::SelectionChanged(int)
{
_currentSelection = CurrentSelection();
emit SourceChanged(_currentSelection);
}
void SourceSelectionWidget::showEvent(QShowEvent *event)
{
FilterComboBox::showEvent(event);
const QSignalBlocker b(this);
Reset();
}
void SourceSelectionWidget::ItemAdd(const QString &)
{
blockSignals(true);
const QSignalBlocker b(this);
Reset();
blockSignals(false);
}
bool SourceSelectionWidget::NameUsed(const QString &name)
@@ -265,9 +270,8 @@ void SourceSelectionWidget::ItemRemove(const QString &name)
void SourceSelectionWidget::ItemRename(const QString &, const QString &)
{
blockSignals(true);
const QSignalBlocker b(this);
Reset();
blockSignals(false);
}
} // namespace advss

9
lib/utils/source-selection.hpp
View File

@@ -39,13 +39,16 @@ class ADVSS_EXPORT SourceSelectionWidget : public FilterComboBox {
Q_OBJECT
public:
SourceSelectionWidget(QWidget *parent, const QStringList &sourceNames,
SourceSelectionWidget(QWidget *parent,
const std::function<QStringList()> &populate,
bool addVariables = true);
void SetSource(const SourceSelection &);
void SetSourceNameList(const QStringList &);
signals:
void SourceChanged(const SourceSelection &);
protected:
void showEvent(QShowEvent *event) override;
private slots:
void SelectionChanged(int);
void ItemAdd(const QString &name);
@@ -59,7 +62,7 @@ private:
bool NameUsed(const QString &name);
bool _addVariables;
QStringList _sourceNames;
std::function<QStringList()> _populateSourcesCallback;
SourceSelection _currentSelection;
// Order of entries