sizeHint calculations moved to the skinlet

examples/gallery/slider/CustomSlider.cpp

@@ -50,17 +50,6 @@ CustomSlider::CustomSlider( QQuickItem* parentItem )
         this, &QskControl::focusIndicatorRectChanged );
 }
 
-QSizeF CustomSlider::contentsSizeHint(
-    Qt::SizeHint which, const QSizeF& constraint ) const
-{
-    auto size = Inherited::contentsSizeHint( which, constraint );
-
-    if ( which == Qt::PreferredSize && size.height() >= 0 )
-        size.setHeight( size.height() + 40 );
-
-    return size;
-}
-
 QRectF CustomSlider::focusIndicatorRect() const
 {
     return subControlRect( Handle );

examples/gallery/slider/CustomSlider.h

@@ -18,9 +18,6 @@ class CustomSlider : public QskSlider
     CustomSlider( QQuickItem* parent = nullptr );
 
     QRectF focusIndicatorRect() const override;
-
-  protected:
-    QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
 };
 
 #endif

examples/gallery/slider/CustomSliderSkinlet.cpp

@@ -370,3 +370,14 @@ QSGNode* CustomSliderSkinlet::updateHandleNode(
 
     return handleNode;
 }
+
+QSizeF CustomSliderSkinlet::sizeHint( const QskSkinnable* skinnable,
+    Qt::SizeHint which, const QSizeF& constraint ) const
+{
+    auto size = Inherited::sizeHint( skinnable, which, constraint );
+
+    if ( which == Qt::PreferredSize && size.height() >= 0 )
+        size.rheight() += 40;
+
+    return size;
+}

examples/gallery/slider/CustomSliderSkinlet.h

@@ -27,6 +27,9 @@ class CustomSliderSkinlet : public QskSliderSkinlet
     QRectF subControlRect( const QskSkinnable*,
         const QRectF&, QskAspect::Subcontrol ) const override;
 
+    QSizeF sizeHint( const QskSkinnable*,
+        Qt::SizeHint, const QSizeF& ) const override;
+
   protected:
     QSGNode* updateSubNode( const QskSkinnable*,
         quint8 nodeRole, QSGNode* ) const override;

examples/layouts/DynamicConstraintsPage.cpp

@@ -22,7 +22,7 @@ namespace
         void transpose();
 
       protected:
-        QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
+        QSizeF layoutSizeHint( Qt::SizeHint, const QSizeF& ) const override;
 
       private:
         qreal m_aspectRatio;
@@ -65,7 +65,7 @@ Control::Control( const char* colorName, qreal aspectRatio, QQuickItem* parent )
     setPreferredHeight( 100 );
 }
 
-QSizeF Control::contentsSizeHint(
+QSizeF Control::layoutSizeHint(
     Qt::SizeHint which, const QSizeF& constraint ) const
 {
     if ( which == Qt::PreferredSize )

examples/mycontrols/MyToggleButton.cpp

@@ -179,33 +179,6 @@ QskGraphic MyToggleButton::graphicAt( int index ) const
     return data.icon;
 }
 
-QSizeF MyToggleButton::contentsSizeHint(
-    Qt::SizeHint which, const QSizeF& constraint ) const
-{
-    if ( which != Qt::PreferredSize )
-        return QSizeF();
-
-    QSizeF hint;
-
-    // better use Minimum Width/Height hints TODO ...
-    constexpr qreal aspectRatio = 4.0 / 3.0;
-
-    if ( constraint.width() >= 0.0 )
-    {
-        hint.rheight() = constraint.width() / aspectRatio;
-    }
-    else if ( constraint.height() >= 0.0 )
-    {
-        hint.rwidth() = constraint.height() * aspectRatio;
-    }
-    else
-    {
-        hint = strutSizeHint( Panel );
-    }
-
-    return hint;
-}
-
 void MyToggleButton::updateResources()
 {
     for( int i = 0; i < 2; i++ )

examples/mycontrols/MyToggleButton.h

@@ -42,7 +42,6 @@ class MyToggleButton : public QskAbstractButton
 
   protected:
     void updateResources() override;
-    QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
 
   private:
     class PrivateData;

examples/mycontrols/MyToggleButtonSkinlet.cpp

@@ -145,4 +145,30 @@ QSGNode* MyToggleButtonSkinlet::updateSubNode(
     }
 }
 
+QSizeF MyToggleButtonSkinlet::sizeHint( const QskSkinnable* skinnable,
+    Qt::SizeHint which, const QSizeF& constraint ) const
+{
+    if ( which != Qt::PreferredSize )
+        return QSizeF();
+
+    QSizeF hint;
+
+    constexpr qreal aspectRatio = 4.0 / 3.0;
+
+    if ( constraint.width() >= 0.0 )
+    {
+        hint.rheight() = constraint.width() / aspectRatio;
+    }
+    else if ( constraint.height() >= 0.0 )
+    {
+        hint.rwidth() = constraint.height() * aspectRatio;
+    }
+    else
+    {
+        hint = skinnable->strutSizeHint( MyToggleButton::Panel );
+    }
+
+    return hint;
+}
+
 #include "moc_MyToggleButtonSkinlet.cpp"

examples/mycontrols/MyToggleButtonSkinlet.h

@@ -37,8 +37,12 @@ class MyToggleButtonSkinlet : public QskSkinlet
     QRectF subControlRect( const QskSkinnable*,
         const QRectF&, QskAspect::Subcontrol ) const override;
 
+    QSizeF sizeHint( const QskSkinnable*,
+        Qt::SizeHint, const QSizeF& ) const override;
+
   protected:
-    QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override;
+    QSGNode* updateSubNode( const QskSkinnable*,
+        quint8 nodeRole, QSGNode* ) const override;
 
   private:
     QRectF innerRect( const QskSkinnable*,

src/controls/QskBox.cpp

@@ -72,13 +72,4 @@ QRectF QskBox::layoutRectForSize( const QSizeF& size ) const
     return innerBox( Panel, subControlRect( size, Panel ) );
 }
 
-QSizeF QskBox::contentsSizeHint(
-    Qt::SizeHint which, const QSizeF& constraint ) const
-{
-    if ( m_hasPanel && which == Qt::PreferredSize )
-        return strutSizeHint( Panel );
-
-    return Inherited::contentsSizeHint( which, constraint );
-}
-
 #include "moc_QskBox.cpp"

src/controls/QskBox.h

@@ -42,9 +42,6 @@ class QSK_EXPORT QskBox : public QskControl
     void panelChanged( bool );
     void paddingChanged( const QMarginsF& );
 
-  protected:
-    QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
-
   private:
     bool m_hasPanel;
 };

src/controls/QskBoxSkinlet.cpp

@@ -46,4 +46,15 @@ QSGNode* QskBoxSkinlet::updateSubNode(
     return Inherited::updateSubNode( skinnable, nodeRole, node );
 }
 
+QSizeF QskBoxSkinlet::sizeHint( const QskSkinnable* skinnable,
+     Qt::SizeHint which, const QSizeF& constraint ) const
+{
+    const auto box = static_cast< const QskBox* >( skinnable );
+
+    if ( box->hasPanel() && which == Qt::PreferredSize )
+        return box->strutSizeHint( QskBox::Panel );
+
+    return Inherited::sizeHint( skinnable, which, constraint );
+}
+
 #include "moc_QskBoxSkinlet.cpp"

src/controls/QskBoxSkinlet.h

@@ -26,6 +26,9 @@ class QSK_EXPORT QskBoxSkinlet : public QskSkinlet
     QRectF subControlRect( const QskSkinnable*,
         const QRectF&, QskAspect::Subcontrol ) const override;
 
+    QSizeF sizeHint( const QskSkinnable*,
+        Qt::SizeHint, const QSizeF& ) const override;
+
   protected:
     QSGNode* updateSubNode( const QskSkinnable*,
         quint8 nodeRole, QSGNode* ) const override;

src/controls/QskControl.cpp

@@ -951,9 +951,10 @@ void QskControl::updateResources()
 {
 }
 
-QSizeF QskControl::contentsSizeHint( Qt::SizeHint, const QSizeF& ) const
+QSizeF QskControl::contentsSizeHint(
+    Qt::SizeHint which, const QSizeF& constraint ) const
 {
-    return QSizeF();
+    return effectiveSkinlet()->sizeHint( this, which, constraint );
 }
 
 QSizeF QskControl::layoutSizeHint(

src/controls/QskGraphicLabel.cpp

@@ -248,34 +248,9 @@ void QskGraphicLabel::updateResources()
     m_data->isSourceDirty = false;
 }
 
-QSizeF QskGraphicLabel::contentsSizeHint(
-    Qt::SizeHint which, const QSizeF& constraint ) const
-{
-    if ( which != Qt::PreferredSize )
-        return QSizeF();
-
-    auto sz = effectiveSourceSize();
-
-    if ( !sz.isEmpty() )
-    {
-        if ( constraint.width() >= 0.0 )
-        {
-            sz.setHeight( sz.height() * constraint.width() / sz.width() );
-            sz.setWidth( -1.0 );
-        }
-        else if ( constraint.height() >= 0.0 )
-        {
-            sz.setWidth( sz.width() * constraint.height() / sz.height() );
-            sz.setHeight( -1.0 );
-        }
-    }
-
-    return sz;
-}
-
 QSizeF QskGraphicLabel::effectiveSourceSize() const
 {
-    const QSizeF& sourceSize = m_data->sourceSize;
+    const auto& sourceSize = m_data->sourceSize;
 
     if ( sourceSize.width() >= 0 && sourceSize.height() >= 0 )
     {

src/controls/QskGraphicLabel.h

@@ -100,9 +100,6 @@ class QSK_EXPORT QskGraphicLabel : public QskControl
     void updateResources() override;
     virtual QskGraphic loadSource( const QUrl& ) const;
 
-    QSizeF contentsSizeHint(
-        Qt::SizeHint, const QSizeF& constraint ) const override;
-
   private:
     class PrivateData;
     std::unique_ptr< PrivateData > m_data;

src/controls/QskGraphicLabelSkinlet.cpp

@@ -103,4 +103,31 @@ QSGNode* QskGraphicLabelSkinlet::updateGraphicNode(
     return node;
 }
 
+QSizeF QskGraphicLabelSkinlet::sizeHint( const QskSkinnable* skinnable,
+    Qt::SizeHint which, const QSizeF& constraint ) const
+{
+    if ( which != Qt::PreferredSize )
+        return QSizeF();
+
+    const auto label = static_cast< const QskGraphicLabel* >( skinnable );
+
+    auto sz = label->effectiveSourceSize();
+
+    if ( !sz.isEmpty() )
+    {
+        if ( constraint.width() >= 0.0 )
+        {
+            sz.setHeight( sz.height() * constraint.width() / sz.width() );
+            sz.setWidth( -1.0 );
+        }
+        else if ( constraint.height() >= 0.0 )
+        {
+            sz.setWidth( sz.width() * constraint.height() / sz.height() );
+            sz.setHeight( -1.0 );
+        }
+    }
+
+    return sz;
+}
+
 #include "moc_QskGraphicLabelSkinlet.cpp"

src/controls/QskGraphicLabelSkinlet.h

@@ -28,6 +28,9 @@ class QSK_EXPORT QskGraphicLabelSkinlet : public QskSkinlet
     QRectF subControlRect( const QskSkinnable*,
         const QRectF&, QskAspect::Subcontrol ) const override;
 
+    QSizeF sizeHint( const QskSkinnable*,
+        Qt::SizeHint, const QSizeF& ) const override;
+
   protected:
     QSGNode* updateSubNode( const QskSkinnable*,
         quint8 nodeRole, QSGNode* ) const override;

src/controls/QskListView.cpp

@@ -153,23 +153,6 @@ QskAspect::Subcontrol QskListView::textSubControlAt( int row, int col ) const
     return ( row == selectedRow() ) ? TextSelected : Text;
 }
 
-QSizeF QskListView::contentsSizeHint(
-    Qt::SizeHint which, const QSizeF& ) const
-{
-    qreal w = -1.0; // shouldn't we return something ???
-
-    if ( which != Qt::MaximumSize )
-    {
-        if ( m_data->preferredWidthFromColumns )
-        {
-            w = scrollableSize().width();
-            w += metric( QskScrollView::VerticalScrollBar | QskAspect::Size );
-        }
-    }
-
-    return QSizeF( w, -1.0 );
-}
-
 void QskListView::keyPressEvent( QKeyEvent* event )
 {
     if ( m_data->selectionMode == NoSelection )

src/controls/QskListView.h

@@ -99,7 +99,6 @@ class QSK_EXPORT QskListView : public QskScrollView
 
     void updateScrollableSize();
 
-    QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
     void componentComplete() override;
 
   private:

src/controls/QskListViewSkinlet.cpp

@@ -95,7 +95,7 @@ QskListViewSkinlet::~QskListViewSkinlet() = default;
 QSGNode* QskListViewSkinlet::updateContentsNode(
     const QskScrollView* scrollView, QSGNode* node ) const
 {
-    const auto* listView = static_cast< const QskListView* >( scrollView );
+    const auto listView = static_cast< const QskListView* >( scrollView );
 
     auto* listViewNode = static_cast< QskListViewNode* >( node );
     if ( listViewNode == nullptr )
@@ -482,4 +482,23 @@ QSGNode* QskListViewSkinlet::updateCellNode( const QskListView* listView,
     return newNode;
 }
 
+QSizeF QskListViewSkinlet::sizeHint( const QskSkinnable* skinnable,
+    Qt::SizeHint which, const QSizeF& ) const
+{
+    const auto listView = static_cast< const QskListView* >( skinnable );
+
+    qreal w = -1.0; // shouldn't we return something ???
+
+    if ( which != Qt::MaximumSize )
+    {
+        if ( listView->preferredWidthFromColumns() )
+        {
+            w = listView->scrollableSize().width();
+            w += listView->metric( QskScrollView::VerticalScrollBar | QskAspect::Size );
+        }
+    }
+
+    return QSizeF( w, -1.0 );
+}
+
 #include "moc_QskListViewSkinlet.cpp"

src/controls/QskListViewSkinlet.h

@@ -27,6 +27,9 @@ class QSK_EXPORT QskListViewSkinlet : public QskScrollViewSkinlet
     Q_INVOKABLE QskListViewSkinlet( QskSkin* = nullptr );
     ~QskListViewSkinlet() override;
 
+    QSizeF sizeHint( const QskSkinnable*,
+        Qt::SizeHint, const QSizeF& ) const override;
+
   protected:
     enum NodeRole
     {