diff --git a/ui/src/customfeedbackdialog.cpp b/ui/src/customfeedbackdialog.cpp index 7e3b57fd6..9968cd7e3 100644 --- a/ui/src/customfeedbackdialog.cpp +++ b/ui/src/customfeedbackdialog.cpp @@ -134,6 +134,7 @@ void CustomFeedbackDialog::setMonitoringVisibility(bool visible) { m_monitorLabel->setVisible(visible); m_monitorSpin->setVisible(visible); + m_monitorColor->setVisible(visible); m_monitorChannelCombo->setVisible(visible); } diff --git a/ui/src/virtualconsole/vcslider.cpp b/ui/src/virtualconsole/vcslider.cpp index 676951d94..c7e065a6a 100644 --- a/ui/src/virtualconsole/vcslider.cpp +++ b/ui/src/virtualconsole/vcslider.cpp @@ -881,6 +881,7 @@ void VCSlider::slotResetButtonClicked() if (!fader.isNull()) fader->removeAll(); } + updateOverrideFeedback(false); emit monitorDMXValueChanged(m_monitorValue); } @@ -1370,6 +1371,7 @@ void VCSlider::setSliderValue(uchar value, bool scale, bool external) { m_resetButton->setStyleSheet(QString("QToolButton{ background: red; }")); m_isOverriding = true; + updateOverrideFeedback(true); } setLevelValue(val, external); setClickAndGoWidgetFromLevel(val); @@ -1510,6 +1512,13 @@ void VCSlider::updateFeedback() sendFeedback(fbv); } +void VCSlider::updateOverrideFeedback(bool on) +{ + QSharedPointer src = inputSource(overrideResetInputSourceId); + if (!src.isNull() && src->isValid() == true) + sendFeedback(src->feedbackValue(on ? QLCInputFeedback::UpperValue : QLCInputFeedback::LowerValue), overrideResetInputSourceId); +} + void VCSlider::slotSliderMoved(int value) { /* Set text for the top label */ @@ -1574,6 +1583,7 @@ void VCSlider::slotInputValueChanged(quint32 universe, quint32 channel, uchar va { m_resetButton->setStyleSheet(QString("QToolButton{ background: red; }")); m_isOverriding = true; + updateOverrideFeedback(true); } if (invertedAppearance()) diff --git a/ui/src/virtualconsole/vcslider.h b/ui/src/virtualconsole/vcslider.h index 280b498ea..d1eacdf1c 100644 --- a/ui/src/virtualconsole/vcslider.h +++ b/ui/src/virtualconsole/vcslider.h @@ -494,6 +494,8 @@ protected slots: void updateFeedback(); + void updateOverrideFeedback(bool on); + signals: void requestSliderUpdate(int value); void valueChanged(QString val);