diff --git a/src/advanced-scene-switcher.hpp b/src/advanced-scene-switcher.hpp index fe19d5db..12aa8b9c 100644 --- a/src/advanced-scene-switcher.hpp +++ b/src/advanced-scene-switcher.hpp @@ -49,8 +49,8 @@ public: std::shared_ptr getSelectedMacro(); void SetEditMacro(Macro &m); void SetMacroEditAreaDisabled(bool); - void HighlightAction(int idx); - void HighlightCondition(int idx); + void HighlightAction(int idx, QColor color = QColor(Qt::green)); + void HighlightCondition(int idx, QColor color = QColor(Qt::green)); void PopulateMacroActions(Macro &m, uint32_t afterIdx = 0); void PopulateMacroConditions(Macro &m, uint32_t afterIdx = 0); void SetActionData(Macro &m); diff --git a/src/macro-core/macro-segment-list.cpp b/src/macro-core/macro-segment-list.cpp index 02bc7322..8d7e9652 100644 --- a/src/macro-core/macro-segment-list.cpp +++ b/src/macro-core/macro-segment-list.cpp @@ -97,7 +97,7 @@ void MacroSegmentList::Clear(int idx) clearLayout(_contentLayout, idx); } -void MacroSegmentList::Highlight(int idx) +void MacroSegmentList::Highlight(int idx, QColor color) { auto item = _contentLayout->itemAt(idx); if (!item) { @@ -107,7 +107,7 @@ void MacroSegmentList::Highlight(int idx) if (!widget) { return; } - PulseWidget(widget, QColor(Qt::green), QColor(0, 0, 0, 0), true); + PulseWidget(widget, color, QColor(0, 0, 0, 0), true); } void MacroSegmentList::SetCollapsed(bool collapse) diff --git a/src/macro-core/macro-segment-list.hpp b/src/macro-core/macro-segment-list.hpp index f753f3f6..bf7b42a5 100644 --- a/src/macro-core/macro-segment-list.hpp +++ b/src/macro-core/macro-segment-list.hpp @@ -20,7 +20,7 @@ public: void Add(QWidget *widget); void Remove(int idx); void Clear(int idx = 0); // Clear all elements >= idx - void Highlight(int idx); + void Highlight(int idx, QColor color = QColor(Qt::green)); void SetCollapsed(bool); void SetSelection(int idx); QVBoxLayout *ContentLayout() { return _contentLayout; } diff --git a/src/macro-core/macro-tab.cpp b/src/macro-core/macro-tab.cpp index 84a27ca1..b8816bd7 100644 --- a/src/macro-core/macro-tab.cpp +++ b/src/macro-core/macro-tab.cpp @@ -299,14 +299,14 @@ void AdvSceneSwitcher::SetMacroEditAreaDisabled(bool disable) ui->macroActionConditionSplitter->setDisabled(disable); } -void AdvSceneSwitcher::HighlightAction(int idx) +void AdvSceneSwitcher::HighlightAction(int idx, QColor color) { - actionsList->Highlight(idx); + actionsList->Highlight(idx, color); } -void AdvSceneSwitcher::HighlightCondition(int idx) +void AdvSceneSwitcher::HighlightCondition(int idx, QColor color) { - conditionsList->Highlight(idx); + conditionsList->Highlight(idx, color); } std::shared_ptr AdvSceneSwitcher::getSelectedMacro()