From 83670c997ca1422beb9a6985b2a2087d1e981d70 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Mon, 28 Oct 2024 16:03:49 +0100
Subject: [PATCH] Halo subcontrol removed

---
 src/controls/QskSlider.cpp        |  1 -
 src/controls/QskSlider.h          |  4 ++--
 src/controls/QskSliderSkinlet.cpp | 26 --------------------------
 src/controls/QskSliderSkinlet.h   |  2 --
 4 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/src/controls/QskSlider.cpp b/src/controls/QskSlider.cpp
index 9607260a..00ad9017 100644
--- a/src/controls/QskSlider.cpp
+++ b/src/controls/QskSlider.cpp
@@ -14,7 +14,6 @@ QSK_SUBCONTROL( QskSlider, Groove )
 QSK_SUBCONTROL( QskSlider, Fill )
 QSK_SUBCONTROL( QskSlider, Scale )
 QSK_SUBCONTROL( QskSlider, Handle )
-QSK_SUBCONTROL( QskSlider, Halo )
 QSK_SUBCONTROL( QskSlider, GrooveStopIndicators )
 QSK_SUBCONTROL( QskSlider, FillStopIndicators )
 QSK_SUBCONTROL( QskSlider, LabelContainer )
diff --git a/src/controls/QskSlider.h b/src/controls/QskSlider.h
index 54f5a953..4452dc89 100644
--- a/src/controls/QskSlider.h
+++ b/src/controls/QskSlider.h
@@ -25,8 +25,8 @@ class QSK_EXPORT QskSlider : public QskBoundedValueInput
     using Inherited = QskBoundedValueInput;
 
   public:
-    QSK_SUBCONTROLS( Panel, Groove, Fill, Scale, Handle, Halo, GrooveStopIndicators, FillStopIndicators,
-        LabelContainer, LabelText )
+    QSK_SUBCONTROLS( Panel, Groove, Fill, Scale, Handle,
+        GrooveStopIndicators, FillStopIndicators, LabelContainer, LabelText )
     QSK_STATES( Pressed )
 
     explicit QskSlider( QQuickItem* parent = nullptr );
diff --git a/src/controls/QskSliderSkinlet.cpp b/src/controls/QskSliderSkinlet.cpp
index 1030f441..a4878256 100644
--- a/src/controls/QskSliderSkinlet.cpp
+++ b/src/controls/QskSliderSkinlet.cpp
@@ -54,7 +54,6 @@ QskSliderSkinlet::QskSliderSkinlet( QskSkin* skin )
         FillStopIndicatorsRole,
         GrooveStopIndicatorsRole,
         HandleRole,
-        HaloRole,
         LabelContainerRole,
         LabelTextRole,
     } );
@@ -94,11 +93,6 @@ QRectF QskSliderSkinlet::subControlRect( const QskSkinnable* skinnable,
         return scaleRect( slider, contentsRect );
     }
 
-    if ( subControl == QskSlider::Halo )
-    {
-        return haloRect( slider, contentsRect );
-    }
-
     if ( subControl == Q::LabelContainer )
     {
         return labelContainerRect( slider, contentsRect );
@@ -213,11 +207,6 @@ QSGNode* QskSliderSkinlet::updateSubNode(
             return updateBoxNode( slider, node, Q::Handle );
         }
 
-        case HaloRole:
-        {
-            return updateBoxNode( slider, node, Q::Halo );
-        }
-
         case LabelContainerRole:
         {
             return updateBoxNode( slider, node, Q::LabelContainer );
@@ -375,21 +364,6 @@ QRectF QskSliderSkinlet::handleRect(
     return handleRect;
 }
 
-QRectF QskSliderSkinlet::haloRect(
-    const QskSlider* slider, const QRectF& rect ) const
-{
-    const auto haloSize = slider->strutSizeHint( Q::Halo );
-    const auto handleSize = slider->strutSizeHint( Q::Handle );
-
-    const auto w = ( haloSize.width() - handleSize.width() ) / 2;
-    const auto h = ( haloSize.height() - handleSize.height() ) / 2;
-
-    auto r = handleRect( slider, rect );
-    r = r.marginsAdded( { w, h, w, h } );
-
-    return r;
-}
-
 QRectF QskSliderSkinlet::labelContainerRect(
     const QskSlider* slider, const QRectF& rect ) const
 {
diff --git a/src/controls/QskSliderSkinlet.h b/src/controls/QskSliderSkinlet.h
index 72d4560d..34a7247b 100644
--- a/src/controls/QskSliderSkinlet.h
+++ b/src/controls/QskSliderSkinlet.h
@@ -25,7 +25,6 @@ class QSK_EXPORT QskSliderSkinlet : public QskSkinlet
         GrooveStopIndicatorsRole,
         FillStopIndicatorsRole,
         HandleRole,
-        HaloRole,
         LabelContainerRole,
         LabelTextRole,
 
@@ -62,7 +61,6 @@ class QSK_EXPORT QskSliderSkinlet : public QskSkinlet
     QRectF fillRect( const QskSlider*, const QRectF& ) const;
     QRectF handleRect( const QskSlider*, const QRectF& ) const;
     QRectF scaleRect( const QskSlider*, const QRectF& ) const;
-    QRectF haloRect( const QskSlider*, const QRectF& ) const;
     QRectF labelContainerRect( const QskSlider*, const QRectF& ) const;
 
     QRectF innerRect( const QskSlider*, const QRectF&, QskAspect::Subcontrol ) const;