* Add variable support to process condition
* Display unresolved variable value in Window action
* Add tooltips to indicate that variables are supported
This commit is contained in:
WarmUpTill
2025-05-26 19:37:35 +02:00
committed by WarmUpTill
parent c05dd40c4c
commit 406e3c1855
4 changed files with 35 additions and 87 deletions

View File

@@ -169,6 +169,9 @@ MacroActionWindowEdit::MacroActionWindowEdit(
{
populateActionSelection(_actions);
_windows->setToolTip(
obs_module_text("AdvSceneSwitcher.tooltip.availableVariables"));
auto focusLimitation = new QLabel(obs_module_text(
"AdvSceneSwitcher.action.window.type.setFocusWindow.limitation"));
_infoLayout->addWidget(focusLimitation);
@@ -207,19 +210,17 @@ void MacroActionWindowEdit::UpdateEntryData()
if (!_entryData) {
return;
}
_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
_windows->setCurrentText(QString::fromStdString(_entryData->_window));
_windows->setCurrentText(
QString::fromStdString(_entryData->_window.UnresolvedValue()));
_regex->SetRegexConfig(_entryData->_regex);
SetWidgetVisibility();
}
void MacroActionWindowEdit::WindowChanged(const QString &text)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_window = text.toStdString();
emit HeaderInfoChanged(
QString::fromStdString(_entryData->GetShortDesc()));
@@ -227,11 +228,7 @@ void MacroActionWindowEdit::WindowChanged(const QString &text)
void MacroActionWindowEdit::RegexChanged(const RegexConfig &regex)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_regex = regex;
adjustSize();
updateGeometry();
@@ -248,11 +245,7 @@ void MacroActionWindowEdit::SetWidgetVisibility()
void MacroActionWindowEdit::ActionChanged(int value)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_action = static_cast<MacroActionWindow::Action>(value);
SetWidgetVisibility();
}