Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-06-22 12:32:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable getting variable values from window condition

Browse Source
This commit is contained in:
WarmUpTill 2023-01-14 19:24:36 +01:00 committed by WarmUpTill
parent b12c25fdf4
commit 1c3ff927a5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/macro-core/macro-condition-window.cpp
View File

@ -45,6 +45,7 @@ bool MacroConditionWindow::CheckWindowTitleSwitchRegex(
break;
}
}
return match;
}
@ -56,11 +57,12 @@ bool foregroundWindowChanged()
bool MacroConditionWindow::CheckCondition()
{
const std::string &currentWindowTitle = switcher->currentTitle;
SetVariableValue(currentWindowTitle);
std::vector<std::string> windowList;
GetWindowList(windowList);
bool match = false;
if (std::find(windowList.begin(), windowList.end(), _window) !=
windowList.end()) {
match = CheckWindowTitleSwitchDirect(currentWindowTitle);
@ -69,7 +71,6 @@ bool MacroConditionWindow::CheckCondition()
windowList);
}
match = match && (!_windowFocusChanged || foregroundWindowChanged());
return match;
}

2
src/macro-core/macro-condition-window.hpp
View File

@ -6,7 +6,7 @@
class MacroConditionWindow : public MacroCondition {
public:
MacroConditionWindow(Macro *m) : MacroCondition(m) {}
MacroConditionWindow(Macro *m) : MacroCondition(m, true) {}
bool CheckCondition();
bool Save(obs_data_t *obj) const;
bool Load(obs_data_t *obj);