WSliderComposed: Add WSliderComposed::highlight property

mixxxdj · Oct 17, 2024 · 166a627 · 166a627
1 parent 731ac26
commit 166a627
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 0 deletions.
diff --git a/res/skins/LateNight/mixer/channel_4decks.xml b/res/skins/LateNight/mixer/channel_4decks.xml
@@ -109,6 +109,7 @@
           </WidgetGroup>
 
           <SliderComposed><!-- Volume -->
+            <ObjectName>ChannelVolume</ObjectName>
             <TooltipId>channel_volume</TooltipId>
             <Size>42f,107f</Size>
             <Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
@@ -122,6 +123,10 @@
             <Connection>
               <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
             </Connection>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,auto_fade_active</ConfigKey>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
           </SliderComposed>
 
         </Children>

diff --git a/res/skins/LateNight/mixer/channel_left.xml b/res/skins/LateNight/mixer/channel_left.xml
@@ -76,6 +76,7 @@ vertical layout and a side-by-side layout for two-deck mode -->
           <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
 
           <SliderComposed><!-- Volume -->
+            <ObjectName>ChannelVolume</ObjectName>
             <TooltipId>channel_volume</TooltipId>
             <Size>42f,107f</Size>
             <Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
@@ -89,6 +90,10 @@ vertical layout and a side-by-side layout for two-deck mode -->
             <Connection>
               <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
             </Connection>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,auto_fade_active</ConfigKey>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
           </SliderComposed>
 
           <WidgetGroup><Size>1min,0me</Size></WidgetGroup>

diff --git a/res/skins/LateNight/mixer/channel_right.xml b/res/skins/LateNight/mixer/channel_right.xml
@@ -34,6 +34,7 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
           <WidgetGroup><Size>1min,4f</Size></WidgetGroup>
 
           <SliderComposed><!-- Volume -->
+            <ObjectName>ChannelVolume</ObjectName>
             <TooltipId>channel_volume</TooltipId>
             <Size>42f,107f</Size>
             <Handle scalemode="STRETCH_ASPECT">skins:LateNight/<Variable name="SliderScheme"/>/sliders/knob_volume_deck.svg</Handle>
@@ -47,6 +48,10 @@ vertical layout and a reversed side-by-side layout for two-deck mode -->
             <Connection>
               <ConfigKey><Variable name="Group"/>,volume</ConfigKey>
             </Connection>
+            <Connection>
+              <ConfigKey><Variable name="Group"/>,auto_fade_active</ConfigKey>
+              <BindProperty>highlight</BindProperty>
+            </Connection>
           </SliderComposed>
 
           <WidgetGroup><Size>1min,0me</Size></WidgetGroup>

diff --git a/res/skins/LateNight/style_classic.qss b/res/skins/LateNight/style_classic.qss
@@ -698,6 +698,7 @@ WLibrary {
 
 /************** Mixer *********************************************************/
 
+#ChannelVolume[highlight="1"],
 #CrossfaderContainer[highlight="1"] {
   border:  1px solid #cf9200;
 }

diff --git a/res/skins/LateNight/style_palemoon.qss b/res/skins/LateNight/style_palemoon.qss
@@ -726,6 +726,7 @@ WBeatSpinBox::down-button,
 
 /************** Mixer ***************************************************/
 
+#ChannelVolume[highlight="1"],
 #CrossfaderContainer[highlight="1"] {
   border:  1px solid #b2421c;
 }

diff --git a/src/widget/wslidercomposed.cpp b/src/widget/wslidercomposed.cpp
@@ -13,6 +13,7 @@
 
 WSliderComposed::WSliderComposed(QWidget* parent)
         : WWidget(parent),
+          m_highlight(0),
           m_dHandleLength(0.0),
           m_dSliderLength(0.0),
           m_bHorizontal(false),
@@ -389,3 +390,17 @@ double WSliderComposed::calculateHandleLength() {
 void WSliderComposed::inputActivity() {
     update();
 }
+
+int WSliderComposed::getHighlight() const {
+    return m_highlight;
+}
+
+void WSliderComposed::setHighlight(int highlight) {
+    if (m_highlight == highlight) {
+        return;
+    }
+    m_highlight = highlight;
+    style()->polish(this);
+    update();
+    emit highlightChanged(m_highlight);
+}
diff --git a/src/widget/wslidercomposed.h b/src/widget/wslidercomposed.h
@@ -16,6 +16,16 @@ class WSliderComposed : public WWidget  {
     explicit WSliderComposed(QWidget* parent = nullptr);
     ~WSliderComposed() override;
 
+    // The highlight property is used to restyle the widget with CSS.
+    // The declaration #MySlider[highlight="1"] { } will define the style
+    // for the highlighted state. Note: The background property does not
+    // support color schemes for images, a workaround is to set the background
+    // image via <BackPath> and <BackPathHighlighted> from the skin.
+    Q_PROPERTY(int highlight READ getHighlight WRITE setHighlight NOTIFY highlightChanged)
+
+    int getHighlight() const;
+    void setHighlight(int highlight);
+
     void setup(const QDomNode& node, const SkinContext& context);
     void setSliderPixmap(
             const PixmapSource& sourceSlider,
@@ -33,6 +43,9 @@ class WSliderComposed : public WWidget  {
     bool tryParseHorizontal(const QDomNode& node) const;
     void inputActivity();
 
+  signals:
+    void highlightChanged(int highlight);
+
   public slots:
     void onConnectedControlChanged(double dParameter, double dValue) override;
     void fillDebugTooltip(QStringList* debug) override;
@@ -51,6 +64,7 @@ class WSliderComposed : public WWidget  {
     double calculateHandleLength();
     void unsetPixmaps();
 
+    int m_highlight;
     // Length of handle in pixels
     double m_dHandleLength;
     // Length of the slider in pixels.