From 0df5775e3e1162a659eb26fea8563e8afc44290c Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Mon, 18 Dec 2023 09:02:45 +0100
Subject: [PATCH] Overlay supports the box model now

---
 playground/parrots/BlurringNode.cpp         |   5 --
 playground/parrots/BlurringNode.h           |   2 +-
 playground/parrots/Overlay.cpp              |  83 +++++++++++++++++---
 playground/parrots/Overlay.h                |   4 +
 playground/parrots/main.cpp                 |  39 +--------
 playground/parrots/shaders/blur.frag.qsb    | Bin 1697 -> 1696 bytes
 playground/parrots/shaders/blur.vert.qsb    | Bin 1382 -> 1378 bytes
 playground/parrots/shaders/rgbswap.frag.qsb | Bin 1208 -> 1206 bytes
 src/nodes/QskBoxNode.cpp                    |   8 +-
 9 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/playground/parrots/BlurringNode.cpp b/playground/parrots/BlurringNode.cpp
index e2083875..63030672 100644
--- a/playground/parrots/BlurringNode.cpp
+++ b/playground/parrots/BlurringNode.cpp
@@ -174,8 +174,3 @@ void BlurringNode::setRect( const QRectF& rect )
         markDirty( QSGNode::DirtyGeometry );
     }
 }
-
-QRectF BlurringNode::rect() const
-{
-    return d_func()->rect;
-}
diff --git a/playground/parrots/BlurringNode.h b/playground/parrots/BlurringNode.h
index 4ba89267..918373ab 100644
--- a/playground/parrots/BlurringNode.h
+++ b/playground/parrots/BlurringNode.h
@@ -9,6 +9,7 @@
 
 class QRect;
 class QSGTexture;
+
 class BlurringNodePrivate;
 
 class BlurringNode : public QSGGeometryNode
@@ -23,7 +24,6 @@ class BlurringNode : public QSGGeometryNode
     QSGTexture* texture();
 
     void setRect( const QRectF& );
-    QRectF rect() const;
 
   private:
     Q_DECLARE_PRIVATE( BlurringNode )
diff --git a/playground/parrots/Overlay.cpp b/playground/parrots/Overlay.cpp
index 080feca0..00f3bfa1 100644
--- a/playground/parrots/Overlay.cpp
+++ b/playground/parrots/Overlay.cpp
@@ -13,6 +13,8 @@
 #include <QskBoxBorderMetrics.h>
 #include <QskBoxBorderColors.h>
 #include <QskGradient.h>
+#include <QskSGNode.h>
+#include <QskRgbValue.h>
 
 namespace
 {
@@ -28,6 +30,12 @@ namespace
             setNodeRoles( { EffectRole, BorderRole } );
         }
 
+        QRectF subControlRect( const QskSkinnable*,
+            const QRectF& contentsRect, QskAspect::Subcontrol ) const override
+        {
+            return contentsRect;
+        }
+
         QSGNode* updateSubNode(
             const QskSkinnable* skinnable, quint8 nodeRole, QSGNode* node ) const
         {
@@ -36,11 +44,10 @@ namespace
             switch ( nodeRole )
             {
                 case EffectRole:
-                    return updateEffectNode( overlay, node );
+                    return updateClippedEffectNode( overlay, node );
 
                 case BorderRole:
-                    return updateBoxNode( overlay, node, overlay->contentsRect(),
-                        QskBoxShapeMetrics(), 1, Qt::darkGray, QskGradient() );
+                    return updateBoxNode( skinnable, node, Overlay::Panel );
                     break;
             };
 
@@ -48,6 +55,47 @@ namespace
         }
 
       private:
+        QSGNode* updateClippedEffectNode( const Overlay* overlay, QSGNode* node ) const
+        {
+            /*
+                There should be a way to avoid the clip node by passing the
+                vertex list directly to the effect node. TODO ...
+             */
+            using Q = Overlay;
+
+            QSGNode* clipNode = nullptr;
+            QSGNode* effectNode = nullptr;
+
+            if ( node )
+            {
+                if ( node->firstChild() )
+                {
+                    clipNode = node;
+                    effectNode = node->firstChild();
+                }
+                else
+                {
+                    effectNode = node;
+                }
+            }
+
+            effectNode = updateEffectNode( overlay, effectNode );
+
+            if ( overlay->boxShapeHint( Q::Panel ).isRectangle() )
+            {
+                delete clipNode;
+                clipNode = nullptr;
+            }
+            else
+            {
+                clipNode = updateBoxClipNode( overlay, clipNode, Q::Panel );
+            }
+
+            QskSGNode::setParentNode( effectNode, clipNode );
+
+            return clipNode ? clipNode : effectNode;
+        }
+
         QSGNode* updateEffectNode( const Overlay* overlay, QSGNode* node ) const
         {
             const auto window = overlay->window();
@@ -71,31 +119,48 @@ namespace
                 effectNode->setTexture( texture );
             }
 
-            auto texture = qobject_cast< QskSceneTexture* >( effectNode->texture() );
-            Q_ASSERT( texture );
+            {
+                auto texture = qobject_cast< QskSceneTexture* >( effectNode->texture() );
+                Q_ASSERT( texture );
 
-            texture->setFiltering( overlay->smooth() ? QSGTexture::Linear : QSGTexture::Nearest );
+                texture->setFiltering(
+                    overlay->smooth() ? QSGTexture::Linear : QSGTexture::Nearest );
 
-            auto finalNode = const_cast< QSGTransformNode* >( qskItemNode( overlay ) );
-            texture->render( rootNode, finalNode, overlay->geometry() );
+                auto finalNode = const_cast< QSGTransformNode* >( qskItemNode( overlay ) );
+                texture->render( rootNode, finalNode, overlay->geometry() );
+            }
 
-            effectNode->setRect( overlay->rect() );
+            {
+                const auto rect = overlay->subControlRect( Overlay::Panel );
+                effectNode->setRect( rect );
+            }
 
             return effectNode;
         }
     };
 }
 
+QSK_SUBCONTROL( Overlay, Panel )
+
 Overlay::Overlay( QQuickItem* parent )
     : Inherited( parent )
 {
     setSkinlet( new Skinlet() );
+
+    setBoxBorderMetricsHint( Panel, 1 );
+    setBoxBorderColorsHint( Panel, QskRgb::toTransparent( QskRgb::DarkGrey, 100 ) );
+    setBoxShapeHint( Panel, QskBoxShapeMetrics( 25, Qt::RelativeSize ) );
 }
 
 Overlay::~Overlay()
 {
 }
 
+QRectF Overlay::layoutRectForSize( const QSizeF& size ) const
+{
+    return subControlContentsRect( size, Panel );
+}
+
 void Overlay::geometryChange(
     const QRectF& newGeometry, const QRectF& oldGeometry )
 {
diff --git a/playground/parrots/Overlay.h b/playground/parrots/Overlay.h
index 1536def2..f3fb4667 100644
--- a/playground/parrots/Overlay.h
+++ b/playground/parrots/Overlay.h
@@ -14,9 +14,13 @@ class Overlay : public QskControl
     using Inherited = QskControl;
 
   public:
+    QSK_SUBCONTROLS( Panel )
+
     Overlay( QQuickItem* = nullptr );
     ~Overlay() override;
 
+    QRectF layoutRectForSize( const QSizeF& ) const override;
+
   protected:
     void geometryChange( const QRectF&, const QRectF& ) override;
 };
diff --git a/playground/parrots/main.cpp b/playground/parrots/main.cpp
index 6b79869e..713f9c42 100644
--- a/playground/parrots/main.cpp
+++ b/playground/parrots/main.cpp
@@ -57,36 +57,6 @@ class ForegroundItem : public QskLinearBox
     }
 };
 
-class OverlayBox : public Overlay
-{
-    using Inherited = Overlay;
-
-  public:
-    OverlayBox( QQuickItem* parent = nullptr )
-        : Inherited( parent )
-    {
-        setObjectName( "overlay" );
-    }
-
-  protected:
-    void geometryChange( const QRectF& newRect, const QRectF& oldRect ) override
-    {
-        Inherited::geometryChange( newRect, oldRect );
-
-        const auto rect = qskItemRect( this );
-
-        const auto children = childItems();
-        for ( auto child : children )
-        {
-            if ( qskIsAdjustableByLayout( child ) )
-            {
-                const auto r = qskConstrainedItemRect( child, rect );
-                qskSetItemGeometry( child, r );
-            }
-        }
-    }
-};
-
 class BackgroundItem : public QskControl
 {
     using Inherited = QskControl;
@@ -97,15 +67,11 @@ class BackgroundItem : public QskControl
     {
         setObjectName( "background" );
 
-#if 1
         m_label = new Image( this );
         m_label->setFillMode( QskGraphicLabel::Stretch );
         m_label->setObjectName( "parrots" );
-#endif
 
-#if 1
         startTimer( 20 );
-#endif
     }
 
   protected:
@@ -162,7 +128,10 @@ class MainView : public QskControl
             box->setObjectName( "redBox" );
         }
 #endif
-        m_overlay = new OverlayBox( m_background );
+        m_overlay = new Overlay( m_background );
+        m_overlay->setAutoLayoutChildren( true );
+        m_overlay->setObjectName( "overlay" );
+
         (void )new ForegroundItem( m_overlay );
 
 #if 0
diff --git a/playground/parrots/shaders/blur.frag.qsb b/playground/parrots/shaders/blur.frag.qsb
index 140daf7c1f31f77e50278daa126a1bc5e309b771..40d031bc0d94bffb458704834af81c09be3d8c19 100644
GIT binary patch
literal 1696
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

literal 1697
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

diff --git a/playground/parrots/shaders/blur.vert.qsb b/playground/parrots/shaders/blur.vert.qsb
index bcc17615d1ec83dbad72cbcfad7d4b0eebd9e979..f530ee4d1fafc4939f582e6b23296c608538783a 100644
GIT binary patch
literal 1378
zcmV-o1)cf;033XHob6d{Puo@$zIh=G1Esu`ZFH?EeMxAQ1(dE6SrAoQZIvofm8qH(
zA<H-p^Oo3PU-PnxkNW}p(qFRQv){0f`!a3k+<R=_I7v4&It5fC+xNUb=lGn<6)?s=
zV)DwteU&-PWd^gD2R}Y*0xt`9<}bQf>Y5>gLuP|IhvzYH^C%i@Vz2{HH7EiaLIk)+
z2brKy>j5<|0;(6-E(=+UVSZt}eyV7piwV|YCSdU)4Fo<;vQ0(rYP7fl(f2{!0%gul
zD9~n<?|EGrdQZ^1nTT?FF1tL6DjKAv6L%U?$q4WT@&5Y7_KR}Bo8{`mio~6Z9Z#__
zu|~ul({XV<#$@7{=px#K6nQtuKhonwqmOUc2>6uOc&w8XysVJt*&OjlNI#;N>8<ic
zDR#umklrTwog=@9;~KngDY%ecQs_km_bgatg*+!Jfa`0pD!?0Sw*dMWyFfA>XdH$d
zVX6^5Mm&^jgfEh7RD%rpn<RgEfkW10l5D5Q&lR$rqP&qe5A-zQLSOfZo}pYm26~o!
zN#C-@vlI{g&r=?A<bPh|o8-1Y>sg{drC5`skMtt(P=153q5KQ@Hd&T*I`aPj4u0P{
z)p3Gqu>sOCq923Cg1|4a%#c1}_=Na%s@rvn{|ne4{Tb<8CqIbiCe>_);@l*?KLPcZ
za&+=hU$bO(K#<R?vvZ#WXPX^Otlu>|*o&8Cevn=w8e@Ezr}LX9q$6wv(%0!*WC;H<
z;b(*&>Dx-}?$ElR$V-H2*yj~}Ansd~^JAbepSz0wZAI@M$$kdENEgZWo?^SA*p?{X
z3hDOQACPFW<oE6G%ZIifIG(GoRw|kna6h!Tz8ki*H<}Jt$K+Lf_|9=nFj{TT<hr+S
zS`I&{X{R+!3tgw>`5m;<LwEq|(DY9ncTYdGtu@{9Jil4fOb%XlLvBm1;~M=0RTKaw
zZXcr`&uQuiy;veZ!bYzv=E&V^8!x@U;h0EWfGA7Q`ikoBRMQ630`AQEP}d@n$gsu%
zH^9X9&%aD5)$&iE9ESr{Rd&>`s>dw3lnz@PzN)_e4vT7$>aZcK#YO6{w@QcomQ?lO
zIabvRc~?apH(g4}`Jemgt<q0RLzFqNhP!R>WU!WWP412bVOn5^nXl`<z2^kn_KUlf
z2&?ZM86EQn&zG51kE;TjLD1H9sN;`bs}<P1XjMvTiG?23Ii*-F$-=|uGPz@sZxws3
zOB8>GZe~)zZa-=>QbTONeE#aS@x=Fnz<BQNhn(_DTL92+pMCdaYwOk1ijqtcOHo*r
zN%V=Z74lRF%3y%|uGB$i`?XSt)2N9Mp>gI;>V)lLoZbWV>y<=%^x~G?+EXzdio9nV
z4z42raaHQ7wA_s+DQ=IJ+SN*WlF<j5H1`A{l~hi-JM*q~>d}pGD?ojlhrXK%ayn>$
zVE4)Wdg%v96?E-u?{~10DkPg*qVVYAPu|)0@u3;i1ZKCI(j6CNp7SjEdn=Cj^s?hx
z?XYR<Uv+G5wvB){+s^KWmhc0o)BGGC<?lD(=n&wk(=|JG0P|_<!m8Hi91>6eKb%F#
z5b;$IbH7$@G{OKjnYL%SmD0}6z;<pl_GyVqJ>DI6(5yBZ@j<wlil7Xvs<m2*LXe9%
z0l6whA;BCBqqf=Ec>p=NK)Rw>cg2)|g4|X`@KSt|i#+08*Wa8<Sf29n9XHj|UQZXL
zPgd#frl#>^uVAx`h{&mKf!#lQ@S$7&OSkmf<5jIkm!_vu7GkppEp@+7s~r8SZcH8M
k<G*P!`uAAsywW32?SJo-_p@gdBkd=;()Qx|8~=cMGTPF}MF0Q*

literal 1382
zcmV-s1)2H)034Kfob6d{Puo@$zIg$Pfl}VeHoDf7z9h8D0!r73EQqR|wn~+#%2Z8?
zkYyZ)c}r}tuX$O;$NhkP=`Y#u*>Bj#eVMj%?mf0|oP-UPRsq$>_C4><IX>rd1&py#
zCa)aa*O<dxW-yC+@Z+-v@Un1c{-KNYxTeYIfZ1Te;dunyJc>>?GuS?;8x#qRArjmp
zr<tLG)&=m?NN6(5c38-ou(|^8X#GslLO0{A%}l`LLrR#$7|Aviy=&3pDj?Vcbqka^
zJElMzQSRq;W#}C_9jA9AQOW7K?9vFTYLK2z+$l&2jmIE)e1H35>qRNxjZ)=NS>n&d
z0Vb&pFi6{UTwISbSpZCU0qsGGyqn}7=`o_w$9HT9e9CJq*2xK8R><>gmiR-YAJI$n
zR(T^7JK|+XZ-e~Kl3&De9p1MUTu3h}^n!wW2CT9|o)Z<o^>tVc!y9Wi5BeB;m}EN8
zSC||S<X4FvB_7H(!WYRkszHYQO_0C5z#(fgLAI0R=PKDwQr^g$1A2;Zp|1x-Pg5?R
z06jy#q;FZ{8H$Jg=O~X^@;@i?O>&#3^$gLUQLG8lM|y#HD8EVAQ2r%+n=DJ36ZwAu
z2fuHP>NrldSO@7S(N92QUf`Elrb!<$d`kQp)$Inw{|#)A{+x7fkRQZzi)uDaac+^`
z-+=lnIYRlUuURrXAjs#{*?B;Mv(1hs)~C%5_TpukAEXzF#uy*x>HOvi=?L2}>Fe|@
zGK7DL@H4`X^c|&kcWFJW$cuz&(B~C>Anx0g^An&jpL>e_9Yyax$$kaDNEgWVzGAzq
z*cK_?GU@i%ACPFU<oE8MO9!?eIG(Gol*^hHa6h!Tz7saJH<}Jt+vF8|_|8#PFq$pT
z<hr+KS`I(1YA01q3tgw_`E9h)LwEq|!1RwDcUM2KtySIfJik%ZOb%XlLT*d0;~KpL
z6%+s_ZXcl^&uQogy-*}T!bYzt=E&V`885xS;h0EGfGA1O`m*ZpMAQ1z0`AP(K-VIX
z$gsvfH^9X9&%aD5)zUAZ9ESr{Rd(2`sz)rjlnz@RysEzc4vT7$>aYQ<#YO6{w@Qco
zkyQ23IabvRc}GPZH(g4}`M~}3R_Uk30m>X$gWWcGGFVNzCU@6@Fio(-%-3|^-gN?Q
z`-Poygw^*Bjkfud=gZ70M->6hAZTkk)bVGp*$ix6u*yZX#6pkioKmb5W#Qp-ncT6+
zw~D>mA&NgkCo?HvrysQ$sUfyrK7aMvc<OsWU_5vCLQeUmEdc2E-~8}&bMw`+vXV>^
zOHo*nN%V-Y8S+#J%Ak+?j?_VC>$Osdlc<Rhp>gI;YKN^toZdtA>lH<NbmNxY+Ep<f
zio9zZ4z42raaC%nwA6_wDQ=gR+SN*WlF<X1H1`A{l~hitGxLsi>e7vHD?ojlhrXK%
za?)>rVE4)We(48D6?E)t?{~10DkPg*qVV|QPu|)0@qroC1ZJn2(j6CNp7SjEdn=Cj
z)RN;`t*~M1U$<>;wv2!`TF%b8mhc0o-S`3@r61Sf=n&wk(>2?60P|_<!m8Ti91>6e
zf1E|g5b>1}bFWse*TVodnU-g{<>K~s-*&Fo_h^YqUEUqH->lZ_@j<wdil7Xvs<l##
zLXe9%0l6wfA;BCBqqf=Jeh4|aK)Rw>_r#Qdg4|X`@M3(Di#+08)8Cv(Sf29n9XHj|
zURM{TPgd#frl#>^uVAwbiO8vLf!#m5|FK)%rCWOK@v7G2OVd*+3$fXQmb%}kRSy4G
oH>M8s@!zx<{i`f>Ug?sj_P<l*z3dsqNc)Mdw7t0g1qsl4H_fflg#Z8m

diff --git a/playground/parrots/shaders/rgbswap.frag.qsb b/playground/parrots/shaders/rgbswap.frag.qsb
index 85e03f2079cd46512deb7928307f422963594302..7ce873e79a7380bfcb360213f5edf81294023a0f 100644
GIT binary patch
literal 1206
zcmV;n1WEe<01d==oXuC=ZyQArUw@<~*R%}<hoouChDgYU$Qa8-2-i_i!bhb_L3LD+
zjCH!4*Uo``XWi|k4psgI9{Hd6S9s)!7X&lAb9bAI6Y_u%8|~fB?0o)acF$pqy}=kO
z!z{qGn9BnA3)v8;B24xd4VD`yexHp%)L~<`4@wiIsEu8#c8eXe7*x@BoURWHDfGO;
zreIovNsrBezD;|3hTLkhxC_2#Ant;&WM|}PFNx-=QBZy&P>#Wm%LLFh3cGNf;!Vdb
zdJi*J>HAV~yMp#D$p1a!z6m*_$J?NS@2{Tso;M;nY_y*=b%Lcd;(M&3(!x1)JYVZG
zR%M7tN%1Ra16Ft7o%l%TEwY0&>OD60s|Niw&>OT~QuI<vZ>KUDuflXi5?+Di_LS|C
z;uXoyW-hKxiVMeEAXQX!No9@eHCQ2-9OgS9Um<YIidR-$T%ozamH}J6pRZy<Z-PDS
zD2w!0h>yGu(RYZ4{_c^zBFV3&wb1gbRD%NTzYXsa#nU0WO1yQT*J-b;@YXo5lMmE?
zK)yCe|AC5G^Qu5UBrMS1heSUz{68jHwD$?rqsX$OfHC|5oF%f2*ez2$U7!(zyOe*I
za=%aceG6I@RU<8f{9UlPOuR1DW{qqf!n2|<)Vwu{v1r8dIoQN_-=!QMk)5R8$p4xA
zZjmiceyha$6Rdu!t6Qcsfy6K?dEw#qsR$!4@cGBhrZo$N>nZBQ8=uVhXc9QGbBXQw
zz_cP6#;)YY@yL2@aTrraw(${q^NwODbso$d*OO-*>l~C~-x~$t6t#E^4}+y`N6vIM
z5n=0qM?oCA0t8N-@XYha{8YFt?gl|PL}uU(IVM%BlY7{1bC-9y6muDeqIFQyCU&$^
zT?aLu*k6Xu_`s1)zc~PLw{iB<{1yK|#nZ^5wX7U&^X$a1-!j}<&3_+@|1k=`7%2Rn
zq44CtLBaDc01(7dXFP&r_Jc_f-UyV1kfbJViUuCnRt84#R~LjwB2=k-#zQgoA}PY!
zaWjb{3|`q&=Lc}1fN0O#%7LvR0v&MlV=x*;Le|`7-Na1EQ6M?Nc3mTRlvMnww!TZS
znXyQ;+S9o9q$35lwUA9<o5B$aLscE=xjKv#c$0Y%eQJW<H_u+YwD-dxitK0pES3a;
zX$E{9eevD?;o*yercPmj@?k7<+J--{(0gegIpJ7HGNG!E0``R#AWdunop3{=P|M|i
z!=A9sp12&YZof+yaDZ(rY!BB-U>b?8xz!+$lL#mi%~;?}s|JeDLMEqSCSg=cHKc%!
z@pA^w%_hh1<BHMbTic%RPU4~9Pp3jU6B~YyO}yh>E8|DrbodcI8YjDOm?ONkd}k^m
zfJ|_uwdnJa9*KXrFh~*OYhuh-wMM`1;=9(Y4+aY~J%3S0_WN-Joj(a&Khr~-Q{fvv
z^{SRwf-fRyCKVhEu!(#ieU;z)s$)PvUk@svo%DVl>eHGY)_y;^q_kXeF7<W~2uzK*
zN~WIPwn=n2yZrTe=Ze<X+BL)E4y4d9J3q)Z&J{PJ(L{mn9c-Q@6$)LExoa~0mBSYN
UPm$}kYh@YHc^x(W1}CWSM<)4MJpcdz

literal 1208
zcmV;p1V{S-01eD|oXuBXZyQArU;jx>u4x+z4oTCN4Uv!ykujEw5U!)31Zbs7L3LD+
zjCH!4*Uo``XWi|k4pqJak9;S-3XeSTf?#HM?rw8&+B_h{MR&I|JHPq!+u1#bF}BPY
zE5luY+hQ&Y;4frDkcx1#zv*HNE`;1=BQST^nC$~_qQKhW8=*JYF^d7t*jw;U#s`KK
zX0XDh;9i1TkIg~8NppLK-D)zp4e@7S?t-yoXB22J$>^%9pyEUTjv<cA1jsc?z3@8V
zb*~%r9%ic252fOE1^ru4{|BUf8*0XgHvxk0Z=Us@H6l4|v>!Effu%I#JFKG0!h7m?
zzQ!|FWynZL=_}|1Mz`Rd#7N{V@`Ezs9vbsiLw*AC291}Lyp+n@sZFM<Fufv)u0VEs
z%6CcWiWFxvm)9och1WY^RaA0GRgL2{7$KP)?)SjHLgbc}t_)1-_;_zXZ(B5<U&Tb;
z1b^637U5S&kGc-Yw@8Qa?vTGC*{`N+q3u^`4GJ{>F1$;WPlx0x>DEDBr@6A?Tl2h5
zF%W-`Vr>xqp2}J4svzGdE->E5BtJ0XKO|f9_Zh55k!4!}bNCZ9OXM55Tc&)vAR`C2
zss1k2ewXU|4p0@fM%o7TyWnw|bX{7THS&1~&x+zu>((g8qLIs&;1lzGpK5$Sev<V@
z{Vx=Ei+pj4TP59J;PrF8x@FoEC=9bDFWlcg6=CEBKL51Yv}U1jJtduZ<C7U5O#(-D
zE~z~qlvX6e*p>V^9$Bv}4%gI?ZG42@yrUEf&V!lbdh)DeodYQLy-^TO5yfM87%J^M
za;CG12wMj{3gXZeU~uY$XP!Uir^0P<HweNZDg$rGv8Y;|!ozf%yS&S#n9Dd6t%I6&
zv7<qCoz!?@e;qpG14laj<^asy#@WyFm;57@Pb16LvU0r5vmL{J&v<J!|9vk0$1MD6
zu<%F5!lVC&1<$`gKoCn^@d%394<<o)Em9UzlDfDq8@OFt85zajTreJqP?hop55?Gv
zqzG%r%_NU7cxg|aA0dPyqCIb`0Jf$GFc9dcU^I$^thvp)$(gdFL~@4hx@PhyS@Fl(
z`!3OD<|5H+PxIQ7juhP1MmCXc8b@dhtLjM4)oG-}o63vqQxo*Qefs=`y&ncqWIy$1
zu_OviHxTRStMB&@51$`2bqNc=hq26|jd<Xp_rgAM!m*I#Laja;*cV!Wkk|ye;D%<Q
zmaG4oJz<+YaXDSxewR4lK-*Z@9*&d5G!tEOszD?t8Bir!u^^a+21?LIrlw&QVXTyD
zNC6$==Nz1yO^)Bk6{E?wwmsjS#6!U!Pla?QHvAr&c*na|rjNYo@DqGAPIh54M|f)a
z&QwG|ncxbw=<|_oi8mY=1jPKBnDbSw(eJzXt~Kj}!2+b`FY3sCKaQaDCxPo{IP^Ic
zz7bQ8YKbTKA_6j5!NCBV$Oq9^^?j&11`PD^pc2|i&*!1ut?6d%_me|P+a>!_PxnB;
z(nzap>gj2lWQTW`zdG++(fS%)GhFUK2@SLJgIwcWaUvQ`6zJZ;=2=py&=HwCCevRz
WY{CB&xo&%{Eh9OPQP)4UaqvhBx?K?f

diff --git a/src/nodes/QskBoxNode.cpp b/src/nodes/QskBoxNode.cpp
index 58329d1b..4de2242c 100644
--- a/src/nodes/QskBoxNode.cpp
+++ b/src/nodes/QskBoxNode.cpp
@@ -78,11 +78,9 @@ void QskBoxNode::updateNode( const QRectF& rect,
     }
 
     /*
-        QskBoxRectangleNode supports vertical/horizontal and many tilted
-        linear gradients.  If our gradient doesn't fall into this category
-        we use a QskBoxFillNode.
-
-        However the border is always done with a QskBoxRectangleNode
+        QskBoxRectangleNode is more efficient and creates batchable geometries.
+        So we prefer using it where possible.
+        Note, that the border is always done with a QskBoxRectangleNode
      */
 
     if ( QskBoxRenderer::isGradientSupported( shape, gradient ) )