Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-04-25 15:34:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add condition "scene has not changed"

Browse Source
This commit is contained in:
WarmUpTill 2021-09-18 09:12:31 +02:00 committed by WarmUpTill
parent 64fd8dd50d
commit 97cbcd7e61
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/en-US.ini
View File

@ -96,6 +96,7 @@ AdvSceneSwitcher.condition.scene="Scene"
AdvSceneSwitcher.condition.scene.type.current="Current scene is" AdvSceneSwitcher.condition.scene.type.current="Current scene is"
AdvSceneSwitcher.condition.scene.type.previous="Previous scene is" AdvSceneSwitcher.condition.scene.type.previous="Previous scene is"
AdvSceneSwitcher.condition.scene.type.changed="Scene chagned" AdvSceneSwitcher.condition.scene.type.changed="Scene chagned"
AdvSceneSwitcher.condition.scene.type.notChanged="Scene has not changed"
AdvSceneSwitcher.condition.scene.entry="{{sceneType}} {{scenes}}" AdvSceneSwitcher.condition.scene.entry="{{sceneType}} {{scenes}}"
AdvSceneSwitcher.condition.window="Window" AdvSceneSwitcher.condition.window="Window"
AdvSceneSwitcher.condition.window.entry.line1="{{windows}} exist and ..." AdvSceneSwitcher.condition.window.entry.line1="{{windows}} exist and ..."

1
src/headers/macro-condition-scene.hpp
View File

@ -9,6 +9,7 @@ enum class SceneType {
CURRENT, CURRENT,
PREVIOUS, PREVIOUS,
CHANGED, CHANGED,
NOTCHANGED,
}; };
class MacroConditionScene : public MacroCondition { class MacroConditionScene : public MacroCondition {

7
src/macro-condition-scene.cpp
View File

@ -14,6 +14,8 @@ static std::map<SceneType, std::string> sceneTypes = {
{SceneType::CURRENT, "AdvSceneSwitcher.condition.scene.type.current"}, {SceneType::CURRENT, "AdvSceneSwitcher.condition.scene.type.current"},
{SceneType::PREVIOUS, "AdvSceneSwitcher.condition.scene.type.previous"}, {SceneType::PREVIOUS, "AdvSceneSwitcher.condition.scene.type.previous"},
{SceneType::CHANGED, "AdvSceneSwitcher.condition.scene.type.changed"}, {SceneType::CHANGED, "AdvSceneSwitcher.condition.scene.type.changed"},
{SceneType::NOTCHANGED,
"AdvSceneSwitcher.condition.scene.type.notChanged"},
}; };
bool MacroConditionScene::CheckCondition() bool MacroConditionScene::CheckCondition()
@ -31,6 +33,8 @@ bool MacroConditionScene::CheckCondition()
return switcher->previousScene == _scene.GetScene(false); return switcher->previousScene == _scene.GetScene(false);
case SceneType::CHANGED: case SceneType::CHANGED:
return sceneChanged; return sceneChanged;
case SceneType::NOTCHANGED:
return !sceneChanged;
default: default:
break; break;
} }
@ -119,7 +123,8 @@ void MacroConditionSceneEdit::TypeChanged(int value)
void MacroConditionSceneEdit::SetWidgetVisibility() void MacroConditionSceneEdit::SetWidgetVisibility()
{ {
_scenes->setVisible(_entryData->_type != SceneType::CHANGED); _scenes->setVisible(_entryData->_type == SceneType::CURRENT ||
_entryData->_type == SceneType::PREVIOUS);
} }
void MacroConditionSceneEdit::UpdateEntryData() void MacroConditionSceneEdit::UpdateEntryData()