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

Enable use of multi-line values for variables

Browse Source
This commit is contained in:
WarmUpTill
2022-11-27 13:21:20 +01:00
committed by WarmUpTill
parent 14f0194372
commit f106329892
6 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/macro-core/macro-condition-variable.cpp
View File

@@ -134,7 +134,7 @@ MacroConditionVariableEdit::MacroConditionVariableEdit(
: QWidget(parent),
_variables(new VariableSelection(this)),
_conditions(new QComboBox()),
_strValue(new QLineEdit()),
_strValue(new ResizingPlainTextEdit(this, 5, 1, 1)),
_numValue(new QDoubleSpinBox()),
_regex(new QCheckBox(
obs_module_text("AdvSceneSwitcher.condition.variable.regex")))
@@ -147,7 +147,7 @@ MacroConditionVariableEdit::MacroConditionVariableEdit(
this, SLOT(VariableChanged(const QString &)));
QWidget::connect(_conditions, SIGNAL(currentIndexChanged(int)), this,
SLOT(ConditionChanged(int)));
QWidget::connect(_strValue, SIGNAL(editingFinished()), this,
QWidget::connect(_strValue, SIGNAL(textChanged()), this,
SLOT(StrValueChanged()));
QWidget::connect(_numValue, SIGNAL(valueChanged(double)), this,
SLOT(NumValueChanged(double)));
@@ -182,7 +182,7 @@ void MacroConditionVariableEdit::UpdateEntryData()
_variables->SetVariable(_entryData->_variableName);
_conditions->setCurrentIndex(static_cast<int>(_entryData->_type));
_strValue->setText(QString::fromStdString(_entryData->_strValue));
_strValue->setPlainText(QString::fromStdString(_entryData->_strValue));
_numValue->setValue(_entryData->_numValue);
_regex->setChecked(_entryData->_regex);
SetWidgetVisibility();
@@ -216,7 +216,8 @@ void MacroConditionVariableEdit::StrValueChanged()
}
std::lock_guard<std::mutex> lock(switcher->m);
_entryData->_strValue = _strValue->text().toStdString();
_entryData->_strValue = _strValue->toPlainText().toStdString();
adjustSize();
}
void MacroConditionVariableEdit::NumValueChanged(double val)