From 713f695aa47095448ab9b807072f12d4b85e6602 Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Sat, 25 Apr 2026 15:28:27 +0200 Subject: [PATCH] Show variable mapping for "Source" and "Twitch" action --- plugins/base/macro-action-source.cpp | 2 ++ plugins/base/macro-action-source.hpp | 1 + plugins/twitch/macro-action-twitch.cpp | 11 ++++++++++- plugins/twitch/macro-action-twitch.hpp | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/plugins/base/macro-action-source.cpp b/plugins/base/macro-action-source.cpp index 25fb4943..b0afc8b5 100644 --- a/plugins/base/macro-action-source.cpp +++ b/plugins/base/macro-action-source.cpp @@ -794,6 +794,8 @@ void MacroActionSourceEdit::SetWidgetVisibility() action == MacroActionSource::Action::CLOSE_FILTER_DIALOG || action == MacroActionSource::Action::CLOSE_PROPERTIES_DIALOG); + emit ShowVariableMappings(isGetSetting || isGetSettings); + adjustSize(); updateGeometry(); } diff --git a/plugins/base/macro-action-source.hpp b/plugins/base/macro-action-source.hpp index d6ea7324..fcfc8720 100644 --- a/plugins/base/macro-action-source.hpp +++ b/plugins/base/macro-action-source.hpp @@ -113,6 +113,7 @@ private slots: signals: void HeaderInfoChanged(const QString &); + void ShowVariableMappings(bool show); private: void SetWidgetVisibility(); diff --git a/plugins/twitch/macro-action-twitch.cpp b/plugins/twitch/macro-action-twitch.cpp index 870ab49e..96e6f1b7 100644 --- a/plugins/twitch/macro-action-twitch.cpp +++ b/plugins/twitch/macro-action-twitch.cpp @@ -1840,7 +1840,10 @@ void MacroActionTwitchEdit::SetWidgetLayout() const char *layoutText; const char *layout2Text = nullptr; - switch (_entryData->GetAction()) { + + const auto action = _entryData->GetAction(); + + switch (action) { case MacroActionTwitch::Action::SEND_CHAT_MESSAGE: layoutText = obs_module_text( "AdvSceneSwitcher.action.twitch.layout.chat"); @@ -1892,6 +1895,12 @@ void MacroActionTwitchEdit::SetWidgetLayout() _layout->setContentsMargins(0, 0, 0, 0); _layout2->setContentsMargins(0, 0, 0, 0); + + const bool showVariableMapping = + action == MacroActionTwitch::Action::CHANNEL_GET_INFO || + action == MacroActionTwitch::Action::USER_GET_INFO || + action == MacroActionTwitch::Action::POINTS_REWARD_GET_INFO; + emit ShowVariableMappings(showVariableMapping); } void MacroActionTwitchEdit::UpdateEntryData() diff --git a/plugins/twitch/macro-action-twitch.hpp b/plugins/twitch/macro-action-twitch.hpp index f9ca4c64..aa17784f 100644 --- a/plugins/twitch/macro-action-twitch.hpp +++ b/plugins/twitch/macro-action-twitch.hpp @@ -267,6 +267,7 @@ private slots: signals: void HeaderInfoChanged(const QString &); + void ShowVariableMappings(bool show); protected: std::shared_ptr _entryData;