From c6baed9f730ae80b7664b54411509efe6bfd7227 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 26 Apr 2022 00:42:26 +0200
Subject: [PATCH] Massive UI revamping (v7): Restored channel highlighted by
 cursor function. Part of #1213

---
 plugins/channelrx/chanalyzer/chanalyzergui.cpp       |  2 +-
 plugins/channelrx/demodadsb/adsbdemodgui.cpp         |  2 +-
 plugins/channelrx/demodais/aisdemodgui.cpp           |  2 +-
 plugins/channelrx/demodam/amdemodgui.cpp             |  2 +-
 plugins/channelrx/demodapt/aptdemodgui.cpp           |  2 +-
 plugins/channelrx/demodatv/atvdemodgui.cpp           |  2 +-
 plugins/channelrx/demodbfm/bfmdemodgui.cpp           |  2 +-
 .../channelrx/demodchirpchat/chirpchatdemodgui.cpp   |  2 +-
 plugins/channelrx/demoddab/dabdemodgui.cpp           |  2 +-
 plugins/channelrx/demoddatv/datvdemodgui.cpp         |  2 +-
 plugins/channelrx/demoddsd/dsddemodgui.cpp           |  2 +-
 plugins/channelrx/demodfreedv/freedvdemodgui.cpp     |  2 +-
 plugins/channelrx/demodnfm/nfmdemodgui.cpp           |  2 +-
 plugins/channelrx/demodpacket/packetdemodgui.cpp     |  2 +-
 plugins/channelrx/demodpager/pagerdemodgui.cpp       |  2 +-
 .../channelrx/demodradiosonde/radiosondedemodgui.cpp |  2 +-
 plugins/channelrx/demodssb/ssbdemodgui.cpp           |  2 +-
 plugins/channelrx/demodvor/vordemodgui.cpp           |  2 +-
 plugins/channelrx/demodvorsc/vordemodscgui.cpp       |  2 +-
 plugins/channelrx/demodwfm/wfmdemodgui.cpp           |  2 +-
 plugins/channelrx/filesink/filesinkgui.cpp           |  2 +-
 plugins/channelrx/freqtracker/freqtrackergui.cpp     |  2 +-
 plugins/channelrx/noisefigure/noisefiguregui.cpp     |  2 +-
 .../channelrx/radioastronomy/radioastronomygui.cpp   |  2 +-
 plugins/channelrx/radioclock/radioclockgui.cpp       |  2 +-
 plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp |  2 +-
 plugins/channelrx/udpsink/udpsinkgui.cpp             |  2 +-
 sdrgui/channel/channelgui.cpp                        | 11 +++++++++--
 sdrgui/channel/channelgui.h                          |  1 +
 sdrgui/gui/rollupcontents.cpp                        | 12 +-----------
 sdrgui/gui/rollupcontents.h                          |  2 --
 31 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
index ce061c88a..54fdddb94 100644
--- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp
@@ -286,7 +286,7 @@ void ChannelAnalyzerGUI::channelMarkerChangedByCursor()
 
 void ChannelAnalyzerGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void ChannelAnalyzerGUI::tick()
diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp
index ee16b190d..4e6ef181e 100644
--- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp
+++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp
@@ -2209,7 +2209,7 @@ void ADSBDemodGUI::channelMarkerChangedByCursor()
 
 void ADSBDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void ADSBDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodais/aisdemodgui.cpp b/plugins/channelrx/demodais/aisdemodgui.cpp
index 72946bac4..0d78263fa 100644
--- a/plugins/channelrx/demodais/aisdemodgui.cpp
+++ b/plugins/channelrx/demodais/aisdemodgui.cpp
@@ -253,7 +253,7 @@ void AISDemodGUI::channelMarkerChangedByCursor()
 
 void AISDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void AISDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp
index 3718d1fcf..f50ee0de6 100644
--- a/plugins/channelrx/demodam/amdemodgui.cpp
+++ b/plugins/channelrx/demodam/amdemodgui.cpp
@@ -131,7 +131,7 @@ void AMDemodGUI::channelMarkerChangedByCursor()
 
 void AMDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void AMDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodapt/aptdemodgui.cpp b/plugins/channelrx/demodapt/aptdemodgui.cpp
index 789459c4e..c6d215d0c 100644
--- a/plugins/channelrx/demodapt/aptdemodgui.cpp
+++ b/plugins/channelrx/demodapt/aptdemodgui.cpp
@@ -307,7 +307,7 @@ void APTDemodGUI::channelMarkerChangedByCursor()
 
 void APTDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void APTDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp
index 41b819517..31bcd52da 100644
--- a/plugins/channelrx/demodatv/atvdemodgui.cpp
+++ b/plugins/channelrx/demodatv/atvdemodgui.cpp
@@ -194,7 +194,7 @@ void ATVDemodGUI::channelMarkerChangedByCursor()
 
 void ATVDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void ATVDemodGUI::handleSourceMessages()
diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
index c486ef29e..1eeddc372 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
@@ -149,7 +149,7 @@ void BFMDemodGUI::channelMarkerChangedByCursor()
 
 void BFMDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void BFMDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp
index a2ca6ffd6..0521ef30e 100644
--- a/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp
+++ b/plugins/channelrx/demodchirpchat/chirpchatdemodgui.cpp
@@ -162,7 +162,7 @@ void ChirpChatDemodGUI::on_deltaFrequency_changed(qint64 value)
 
 void ChirpChatDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void ChirpChatDemodGUI::on_BW_valueChanged(int value)
diff --git a/plugins/channelrx/demoddab/dabdemodgui.cpp b/plugins/channelrx/demoddab/dabdemodgui.cpp
index b64e9e8a5..d52f9ebbc 100644
--- a/plugins/channelrx/demoddab/dabdemodgui.cpp
+++ b/plugins/channelrx/demoddab/dabdemodgui.cpp
@@ -318,7 +318,7 @@ void DABDemodGUI::channelMarkerChangedByCursor()
 
 void DABDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void DABDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demoddatv/datvdemodgui.cpp b/plugins/channelrx/demoddatv/datvdemodgui.cpp
index 6e5b70674..921200494 100644
--- a/plugins/channelrx/demoddatv/datvdemodgui.cpp
+++ b/plugins/channelrx/demoddatv/datvdemodgui.cpp
@@ -148,7 +148,7 @@ void DATVDemodGUI::channelMarkerChangedByCursor()
 
 void DATVDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 
diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp
index 5f5d30829..fc256d618 100644
--- a/plugins/channelrx/demoddsd/dsddemodgui.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp
@@ -534,7 +534,7 @@ void DSDDemodGUI::channelMarkerChangedByCursor()
 
 void DSDDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void DSDDemodGUI::audioSelect()
diff --git a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp
index 2ed6714be..6f534d75b 100644
--- a/plugins/channelrx/demodfreedv/freedvdemodgui.cpp
+++ b/plugins/channelrx/demodfreedv/freedvdemodgui.cpp
@@ -133,7 +133,7 @@ void FreeDVDemodGUI::channelMarkerChangedByCursor()
 
 void FreeDVDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void FreeDVDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
index ae06b8e1b..56c190aea 100644
--- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp
@@ -125,7 +125,7 @@ void NFMDemodGUI::channelMarkerChangedByCursor()
 
 void NFMDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void NFMDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodpacket/packetdemodgui.cpp b/plugins/channelrx/demodpacket/packetdemodgui.cpp
index e132d0547..45fc8e6d5 100644
--- a/plugins/channelrx/demodpacket/packetdemodgui.cpp
+++ b/plugins/channelrx/demodpacket/packetdemodgui.cpp
@@ -257,7 +257,7 @@ void PacketDemodGUI::channelMarkerChangedByCursor()
 
 void PacketDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void PacketDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodpager/pagerdemodgui.cpp b/plugins/channelrx/demodpager/pagerdemodgui.cpp
index 8ae79a3a3..4e63805ac 100644
--- a/plugins/channelrx/demodpager/pagerdemodgui.cpp
+++ b/plugins/channelrx/demodpager/pagerdemodgui.cpp
@@ -313,7 +313,7 @@ void PagerDemodGUI::channelMarkerChangedByCursor()
 
 void PagerDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void PagerDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp
index 1c34e1542..ec051fbcc 100644
--- a/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp
+++ b/plugins/channelrx/demodradiosonde/radiosondedemodgui.cpp
@@ -360,7 +360,7 @@ void RadiosondeDemodGUI::channelMarkerChangedByCursor()
 
 void RadiosondeDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void RadiosondeDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp
index ad1e1c61b..9b12529f4 100644
--- a/plugins/channelrx/demodssb/ssbdemodgui.cpp
+++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp
@@ -122,7 +122,7 @@ void SSBDemodGUI::channelMarkerChangedByCursor()
 
 void SSBDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void SSBDemodGUI::on_audioBinaural_toggled(bool binaural)
diff --git a/plugins/channelrx/demodvor/vordemodgui.cpp b/plugins/channelrx/demodvor/vordemodgui.cpp
index 14410fb43..1a4820be2 100644
--- a/plugins/channelrx/demodvor/vordemodgui.cpp
+++ b/plugins/channelrx/demodvor/vordemodgui.cpp
@@ -889,7 +889,7 @@ void VORDemodGUI::channelMarkerChangedByCursor()
 
 void VORDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void VORDemodGUI::on_thresh_valueChanged(int value)
diff --git a/plugins/channelrx/demodvorsc/vordemodscgui.cpp b/plugins/channelrx/demodvorsc/vordemodscgui.cpp
index 8cdd2be12..dd657e541 100644
--- a/plugins/channelrx/demodvorsc/vordemodscgui.cpp
+++ b/plugins/channelrx/demodvorsc/vordemodscgui.cpp
@@ -194,7 +194,7 @@ void VORDemodSCGUI::channelMarkerChangedByCursor()
 
 void VORDemodSCGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void VORDemodSCGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp
index a191a7601..47237c6f7 100644
--- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp
+++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp
@@ -113,7 +113,7 @@ void WFMDemodGUI::channelMarkerChangedByCursor()
 
 void WFMDemodGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void WFMDemodGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/filesink/filesinkgui.cpp b/plugins/channelrx/filesink/filesinkgui.cpp
index 98ddc362e..b4127e18f 100644
--- a/plugins/channelrx/filesink/filesinkgui.cpp
+++ b/plugins/channelrx/filesink/filesinkgui.cpp
@@ -333,7 +333,7 @@ void FileSinkGUI::channelMarkerChangedByCursor()
 
 void FileSinkGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void FileSinkGUI::handleSourceMessages()
diff --git a/plugins/channelrx/freqtracker/freqtrackergui.cpp b/plugins/channelrx/freqtracker/freqtrackergui.cpp
index 3e946492f..c1ebd541d 100644
--- a/plugins/channelrx/freqtracker/freqtrackergui.cpp
+++ b/plugins/channelrx/freqtracker/freqtrackergui.cpp
@@ -144,7 +144,7 @@ void FreqTrackerGUI::channelMarkerChangedByCursor()
 
 void FreqTrackerGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void FreqTrackerGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/noisefigure/noisefiguregui.cpp b/plugins/channelrx/noisefigure/noisefiguregui.cpp
index 8c0b1f427..703f69ebc 100644
--- a/plugins/channelrx/noisefigure/noisefiguregui.cpp
+++ b/plugins/channelrx/noisefigure/noisefiguregui.cpp
@@ -320,7 +320,7 @@ void NoiseFigureGUI::channelMarkerChangedByCursor()
 
 void NoiseFigureGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void NoiseFigureGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/radioastronomy/radioastronomygui.cpp b/plugins/channelrx/radioastronomy/radioastronomygui.cpp
index d37a99def..77070dd1a 100644
--- a/plugins/channelrx/radioastronomy/radioastronomygui.cpp
+++ b/plugins/channelrx/radioastronomy/radioastronomygui.cpp
@@ -1111,7 +1111,7 @@ void RadioAstronomyGUI::channelMarkerChangedByCursor()
 
 void RadioAstronomyGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 // Calculate Tsys0 - i.e. receiver noise temperature when there's no source signal, just unwanted noise
diff --git a/plugins/channelrx/radioclock/radioclockgui.cpp b/plugins/channelrx/radioclock/radioclockgui.cpp
index 72976c9b0..6e98b8dc6 100644
--- a/plugins/channelrx/radioclock/radioclockgui.cpp
+++ b/plugins/channelrx/radioclock/radioclockgui.cpp
@@ -168,7 +168,7 @@ void RadioClockGUI::channelMarkerChangedByCursor()
 
 void RadioClockGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void RadioClockGUI::on_deltaFrequency_changed(qint64 value)
diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp
index eca7730ba..c88796bf9 100644
--- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp
+++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.cpp
@@ -325,7 +325,7 @@ void SigMFFileSinkGUI::channelMarkerChangedByCursor()
 
 void SigMFFileSinkGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void SigMFFileSinkGUI::handleSourceMessages()
diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp
index 44bf1b881..3043c2a1c 100644
--- a/plugins/channelrx/udpsink/udpsinkgui.cpp
+++ b/plugins/channelrx/udpsink/udpsinkgui.cpp
@@ -120,7 +120,7 @@ void UDPSinkGUI::channelMarkerChangedByCursor()
 
 void UDPSinkGUI::channelMarkerHighlightedByCursor()
 {
-    getRollupContents()->setHighlighted(m_channelMarker.getHighlighted());
+    setHighlighted(m_channelMarker.getHighlighted());
 }
 
 void UDPSinkGUI::tick()
diff --git a/sdrgui/channel/channelgui.cpp b/sdrgui/channel/channelgui.cpp
index 6f2f91cf0..590d9b65b 100644
--- a/sdrgui/channel/channelgui.cpp
+++ b/sdrgui/channel/channelgui.cpp
@@ -46,8 +46,8 @@ ChannelGUI::ChannelGUI(QWidget *parent) :
     setWindowFlags(windowFlags() | Qt::FramelessWindowHint);
     setObjectName("ChannelGUI");
     setStyleSheet(QString(tr("#ChannelGUI { border: 1px solid %1; background-color: %2; }")
-        .arg(palette().highlight().color().darker(115).name()))
-        .arg(palette().dark().color().darker(115).name()));
+        .arg(palette().highlight().color().darker(115).name())
+        .arg(palette().dark().color().darker(115).name())));
 
     m_indexLabel = new QLabel();
     m_indexLabel->setFixedSize(50, 16);
@@ -395,6 +395,13 @@ bool ChannelGUI::isOnMovingPad()
     return m_indexLabel->underMouse() || m_titleLabel->underMouse() || m_statusFrequency->underMouse() || m_statusLabel->underMouse();
 }
 
+void ChannelGUI::setHighlighted(bool highlighted)
+{
+    setStyleSheet(QString(tr("#ChannelGUI { border: 1px solid %1; background-color: %2; }")
+        .arg(highlighted ? "#FFFFFF" : palette().highlight().color().darker(115).name())
+        .arg(palette().dark().color().darker(115).name())));
+}
+
 QString ChannelGUI::getDeviceTypeTag()
 {
     switch (m_deviceType)
diff --git a/sdrgui/channel/channelgui.h b/sdrgui/channel/channelgui.h
index 79199dd33..d05b71f36 100644
--- a/sdrgui/channel/channelgui.h
+++ b/sdrgui/channel/channelgui.h
@@ -96,6 +96,7 @@ protected:
     void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
     void updateIndexLabel();
     int getAdditionalHeight() const { return 25 + 22; }
+    void setHighlighted(bool highlighted);
 
     DeviceType m_deviceType;
     int m_deviceSetIndex;
diff --git a/sdrgui/gui/rollupcontents.cpp b/sdrgui/gui/rollupcontents.cpp
index aa5c90b5e..148fc66ea 100644
--- a/sdrgui/gui/rollupcontents.cpp
+++ b/sdrgui/gui/rollupcontents.cpp
@@ -28,7 +28,6 @@
 
 RollupContents::RollupContents(QWidget* parent) :
     QWidget(parent),
-    m_highlighted(false),
     m_streamIndicator("S"),
     // m_channelWidget(true),
     m_newHeight(0)
@@ -83,15 +82,6 @@ void RollupContents::restoreState(const RollupState& state)
     }
 }
 
-void RollupContents::setHighlighted(bool highlighted)
-{
-    if (m_highlighted != highlighted)
-    {
-        m_highlighted = highlighted;
-        update();
-    }
-}
-
 bool RollupContents::hasExpandableWidgets()
 {
     for (int i = 0; i < children().count(); ++i)
@@ -219,7 +209,7 @@ void RollupContents::paintEvent(QPaintEvent*)
     // p.drawRect(width() - 5, height() - 5, 5, 5);
 
     // Rahmen (frame)
-    p.setPen(m_highlighted ? Qt::white : frameColor);
+    // p.setPen(m_highlighted ? Qt::white : frameColor);
     p.setBrush(palette().window());
     QRectF r(rect());
     // r.adjust(0.5, 0.5, -0.5, -0.5);
diff --git a/sdrgui/gui/rollupcontents.h b/sdrgui/gui/rollupcontents.h
index 898505a59..db6d2365b 100644
--- a/sdrgui/gui/rollupcontents.h
+++ b/sdrgui/gui/rollupcontents.h
@@ -30,7 +30,6 @@ class SDRGUI_API RollupContents : public QWidget {
 
 public:
     RollupContents(QWidget* parent = nullptr);
-    void setHighlighted(bool highlighted);
     void saveState(RollupState& state) const;
     void restoreState(const RollupState& state);
     int arrangeRollups();
@@ -44,7 +43,6 @@ protected:
         VersionMarker = 0xff
     };
 
-    bool m_highlighted;
     QString m_streamIndicator;
     QString m_helpURL;