168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

making layout calculations of the skinlets independent from the current 

of the control
This commit is contained in:
Uwe Rathmann 2019-04-25 14:23:39 +02:00
parent 3f1c5fc948
commit 91c16e8076
46 changed files with 308 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
examples/automotive/SpeedometerSkinlet.cpp
View File

@ -47,13 +47,10 @@ SpeedometerSkinlet::SpeedometerSkinlet( QskSkin* skin )
SpeedometerSkinlet::~SpeedometerSkinlet() = default; SpeedometerSkinlet::~SpeedometerSkinlet() = default;
QRectF SpeedometerSkinlet::subControlRect( QRectF SpeedometerSkinlet::subControlRect( const QskSkinnable*,
const QskSkinnable* skinnable, QskAspect::Subcontrol ) const const QRectF& contentsRect, QskAspect::Subcontrol ) const
{ {
const auto speedometer = static_cast< const Speedometer* >( skinnable ); return contentsRect;
// ### differentiate for subcontrols
return speedometer->contentsRect();
} }
QSGNode* SpeedometerSkinlet::updateSubNode( QSGNode* SpeedometerSkinlet::updateSubNode(
@ -77,7 +74,8 @@ QSGNode* SpeedometerSkinlet::updateSubNode(
} }
} }
QSGNode* SpeedometerSkinlet::updatePanelNode( const Speedometer* speedometer, QSGNode* node ) const QSGNode* SpeedometerSkinlet::updatePanelNode(
const Speedometer* speedometer, QSGNode* node ) const
{ {
auto boxNode = static_cast< QskBoxNode* >( node ); auto boxNode = static_cast< QskBoxNode* >( node );
@ -86,8 +84,11 @@ QSGNode* SpeedometerSkinlet::updatePanelNode( const Speedometer* speedometer, QS
boxNode = new QskBoxNode; boxNode = new QskBoxNode;
} }
QRectF panelRect = subControlRect( speedometer, Speedometer::Panel ); const auto panelRect = subControlRect(
qreal radius = panelRect.width() / 2; speedometer, speedometer->contentsRect(), Speedometer::Panel );
const qreal radius = panelRect.width() / 2;
QskBoxShapeMetrics shapeMetrics( radius, radius, radius, radius ); QskBoxShapeMetrics shapeMetrics( radius, radius, radius, radius );
QskBoxBorderMetrics borderMetrics = speedometer->boxBorderMetricsHint( Speedometer::Panel ); QskBoxBorderMetrics borderMetrics = speedometer->boxBorderMetricsHint( Speedometer::Panel );
QskBoxBorderColors borderColors = speedometer->boxBorderColorsHint( Speedometer::Panel ); QskBoxBorderColors borderColors = speedometer->boxBorderColorsHint( Speedometer::Panel );
@ -127,9 +128,11 @@ QSGNode* SpeedometerSkinlet::updateLabelsNode( const Speedometer* speedometer, Q
auto vertexData = geometry->vertexDataAsPoint2D(); auto vertexData = geometry->vertexDataAsPoint2D();
memset( vertexData, 0, static_cast< size_t >( geometry->vertexCount() ) ); memset( vertexData, 0, static_cast< size_t >( geometry->vertexCount() ) );
QMarginsF panelMargins = speedometer->marginsHint( Speedometer::Panel | QskAspect::Margin ); const auto panelMargins = speedometer->marginsHint( Speedometer::Panel | QskAspect::Margin );
const QRectF panelRect = subControlRect( speedometer,
Speedometer::Panel ).marginsRemoved( panelMargins ); auto panelRect = subControlRect(
speedometer, speedometer->contentsRect(), Speedometer::Panel );
panelRect = panelRect.marginsRemoved( panelMargins );
QPointF center = QPointF( panelRect.x() + panelRect.width() / 2, QPointF center = QPointF( panelRect.x() + panelRect.width() / 2,
panelRect.y() + panelRect.height() / 2 ); panelRect.y() + panelRect.height() / 2 );
@ -227,8 +230,13 @@ QSGNode* SpeedometerSkinlet::updateNeedleNode(
boxNode = static_cast< QskBoxNode* >( needleNode->childAtIndex( 0 ) ); boxNode = static_cast< QskBoxNode* >( needleNode->childAtIndex( 0 ) );
} }
QMarginsF margins = speedometer->marginsHint( Speedometer::Panel | QskAspect::Margin ); const auto margins = speedometer->marginsHint( Speedometer::Panel | QskAspect::Margin );
const QRectF panelRect = subControlRect( speedometer, Speedometer::Panel ).marginsRemoved( margins );
auto panelRect = subControlRect(
speedometer, speedometer->contentsRect(), Speedometer::Panel );
panelRect = panelRect.marginsRemoved( margins );
auto radius = speedometer->metric( Speedometer::NeedleHead | QskAspect::Size ); auto radius = speedometer->metric( Speedometer::NeedleHead | QskAspect::Size );
QPointF center = QPointF( panelRect.x() + panelRect.width() / 2, QPointF center = QPointF( panelRect.x() + panelRect.width() / 2,
panelRect.y() + panelRect.height() / 2 ); panelRect.y() + panelRect.height() / 2 );

4
examples/automotive/SpeedometerSkinlet.h
View File

@ -20,8 +20,8 @@ class SpeedometerSkinlet : public QskSkinlet
Q_INVOKABLE SpeedometerSkinlet( QskSkin* skin = nullptr ); Q_INVOKABLE SpeedometerSkinlet( QskSkin* skin = nullptr );
~SpeedometerSkinlet() override; ~SpeedometerSkinlet() override;
QRectF subControlRect( const QskSkinnable* skinnable, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
virtual QSGNode* updateSubNode( const QskSkinnable*, virtual QSGNode* updateSubNode( const QskSkinnable*,

29
examples/mycontrols/MyToggleButtonSkinlet.cpp
View File

@ -33,8 +33,8 @@ MyToggleButtonSkinlet::MyToggleButtonSkinlet( QskSkin* skin )
); );
} }
QRectF MyToggleButtonSkinlet::subControlRect( QRectF MyToggleButtonSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
using Q = MyToggleButton; using Q = MyToggleButton;
@ -42,25 +42,25 @@ QRectF MyToggleButtonSkinlet::subControlRect(
if( subControl == Q::Panel ) if( subControl == Q::Panel )
{ {
return button->contentsRect(); return contentsRect;
} }
else if( subControl == Q::UncheckedPanel ) else if( subControl == Q::UncheckedPanel )
{ {
const auto rect = innerRect( skinnable, Q::Panel ); const auto r = innerRect( skinnable, contentsRect, Q::Panel );
return sectionRect( rect, button->isInverted() ? 0 : 1 ); return sectionRect( r, button->isInverted() ? 0 : 1 );
} }
else if( subControl == Q::CheckedPanel ) else if( subControl == Q::CheckedPanel )
{ {
const auto rect = innerRect( skinnable, Q::Panel ); const auto r = innerRect( skinnable, contentsRect, Q::Panel );
return sectionRect( rect, button->isInverted() ? 1 : 0 ); return sectionRect( r, button->isInverted() ? 1 : 0 );
} }
else if( subControl == Q::CheckedLabel || subControl == Q::CheckedIcon ) else if( subControl == Q::CheckedLabel || subControl == Q::CheckedIcon )
{ {
return innerRect( skinnable, Q::CheckedPanel ); return innerRect( skinnable, contentsRect, Q::CheckedPanel );
} }
else if( subControl == Q::UncheckedLabel || subControl == Q::UncheckedIcon ) else if( subControl == Q::UncheckedLabel || subControl == Q::UncheckedIcon )
{ {
return innerRect( skinnable, Q::UncheckedPanel ); return innerRect( skinnable, contentsRect, Q::UncheckedPanel );
} }
else if( subControl == Q::Cursor ) else if( subControl == Q::Cursor )
{ {
@ -68,7 +68,7 @@ QRectF MyToggleButtonSkinlet::subControlRect(
if ( button->isInverted() ) if ( button->isInverted() )
position = 1.0 - position; position = 1.0 - position;
auto rect = innerRect( skinnable, Q::Panel ); auto rect = innerRect( skinnable, contentsRect, Q::Panel );
rect.setWidth( 0.5 * rect.width() ); rect.setWidth( 0.5 * rect.width() );
rect.moveLeft( rect.left() + position * rect.width() ); rect.moveLeft( rect.left() + position * rect.width() );
@ -76,13 +76,14 @@ QRectF MyToggleButtonSkinlet::subControlRect(
return rect; return rect;
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QRectF MyToggleButtonSkinlet::innerRect( QRectF MyToggleButtonSkinlet::innerRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& rect, QskAspect::Subcontrol subControl ) const
{ {
return skinnable->innerBox( subControl, subControlRect( skinnable, subControl ) ); const auto r = subControlRect( skinnable, rect, subControl );
return skinnable->innerBox( subControl, r );
} }
QSGNode* MyToggleButtonSkinlet::updateSubNode( QSGNode* MyToggleButtonSkinlet::updateSubNode(

6
examples/mycontrols/MyToggleButtonSkinlet.h
View File

@ -34,13 +34,15 @@ class MyToggleButtonSkinlet : public QskSkinlet
Q_INVOKABLE MyToggleButtonSkinlet( QskSkin* = nullptr ); Q_INVOKABLE MyToggleButtonSkinlet( QskSkin* = nullptr );
~MyToggleButtonSkinlet() override = default; ~MyToggleButtonSkinlet() override = default;
QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const override; QRectF subControlRect( const QskSkinnable*,
const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override; QSGNode* updateSubNode( const QskSkinnable*, quint8 nodeRole, QSGNode* ) const override;
private: private:
QRectF innerRect( const QskSkinnable*, QskAspect::Subcontrol ) const; QRectF innerRect( const QskSkinnable*,
const QRectF&, QskAspect::Subcontrol ) const;
}; };
#endif #endif

51
examples/sliders/SliderSkinlet.cpp
View File

@ -120,8 +120,8 @@ SliderSkinlet::~SliderSkinlet()
{ {
} }
QRectF SliderSkinlet::subControlRect( QRectF SliderSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto slider = static_cast< const QskSlider* >( skinnable ); const auto slider = static_cast< const QskSlider* >( skinnable );
@ -131,22 +131,22 @@ QRectF SliderSkinlet::subControlRect(
} }
else if ( subControl == QskSlider::Fill ) else if ( subControl == QskSlider::Fill )
{ {
return fillRect( slider ); return fillRect( slider, contentsRect );
} }
else if ( subControl == QskSlider::Handle ) else if ( subControl == QskSlider::Handle )
{ {
return handleRect( slider ); return handleRect( slider, contentsRect );
} }
else if ( subControl == Slider::Scale ) else if ( subControl == Slider::Scale )
{ {
return scaleRect( slider ); return scaleRect( contentsRect );
} }
else if ( subControl == Slider::Decoration ) else if ( subControl == Slider::Decoration )
{ {
return decorationRect( slider ); return decorationRect( slider, contentsRect );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* SliderSkinlet::updateSubNode( QSGNode* SliderSkinlet::updateSubNode(
@ -173,9 +173,9 @@ QSGNode* SliderSkinlet::updateSubNode(
} }
} }
QRectF SliderSkinlet::scaleRect( const QskSlider* slider ) const QRectF SliderSkinlet::scaleRect( const QRectF& contentsRect ) const
{ {
auto r = slider->contentsRect(); auto r = contentsRect;
r.setX( r.left() + qskMargin ); r.setX( r.left() + qskMargin );
r.setBottom( r.center().y() ); r.setBottom( r.center().y() );
@ -185,9 +185,10 @@ QRectF SliderSkinlet::scaleRect( const QskSlider* slider ) const
return r; return r;
} }
QRectF SliderSkinlet::fillRect( const QskSlider* slider ) const QRectF SliderSkinlet::fillRect(
const QskSlider* slider, const QRectF& contentsRect ) const
{ {
auto r = subControlRect( slider, Slider::Scale ); auto r = subControlRect( slider, contentsRect, Slider::Scale );
r.setTop( r.bottom() - qskMinorTick ); r.setTop( r.bottom() - qskMinorTick );
r.setWidth( r.width() * slider->position() ); r.setWidth( r.width() * slider->position() );
@ -195,22 +196,23 @@ QRectF SliderSkinlet::fillRect( const QskSlider* slider ) const
return r; return r;
} }
QRectF SliderSkinlet::decorationRect( const QskSlider* slider ) const QRectF SliderSkinlet::decorationRect(
const QskSlider* slider, const QRectF& contentsRect ) const
{ {
// decoration exceeds scale !!!! // decoration exceeds scale !!!!
auto r = subControlRect( slider, Slider::Scale ); auto r = subControlRect( slider, contentsRect, Slider::Scale );
r.setBottom( r.top() ); r.setBottom( r.top() );
r.setTop( r.bottom() - QFontMetricsF( qskLabelFont ).height() ); r.setTop( r.bottom() - QFontMetricsF( qskLabelFont ).height() );
return r; return r;
} }
QRectF SliderSkinlet::handleRect( const QskSlider* slider ) const QRectF SliderSkinlet::handleRect(
const QskSlider* slider, const QRectF& contentsRect ) const
{ {
const QRectF contentsRect = slider->contentsRect(); const QRectF fillRect = subControlRect( slider, contentsRect, QskSlider::Fill );
const QRectF fillRect = subControlRect( slider, QskSlider::Fill ); const QRectF scaleRect = subControlRect( slider, contentsRect, Slider::Scale );
const QRectF scaleRect = subControlRect( slider, Slider::Scale );
QRectF handleRect( 0, scaleRect.bottom(), 80, 50 ); QRectF handleRect( 0, scaleRect.bottom(), 80, 50 );
handleRect.moveCenter( QPointF( fillRect.right(), handleRect.center().y() ) ); handleRect.moveCenter( QPointF( fillRect.right(), handleRect.center().y() ) );
@ -226,7 +228,9 @@ QRectF SliderSkinlet::handleRect( const QskSlider* slider ) const
QSGNode* SliderSkinlet::updateScaleNode( QSGNode* SliderSkinlet::updateScaleNode(
const QskSlider* slider, QSGNode* node ) const const QskSlider* slider, QSGNode* node ) const
{ {
const QRectF scaleRect = subControlRect( slider, Slider::Scale ); const auto scaleRect = subControlRect(
slider, slider->contentsRect(), Slider::Scale );
if ( scaleRect.isEmpty() ) if ( scaleRect.isEmpty() )
return nullptr; return nullptr;
@ -267,7 +271,9 @@ QSGNode* SliderSkinlet::updateScaleNode(
QSGNode* SliderSkinlet::updateDecorationNode( QSGNode* SliderSkinlet::updateDecorationNode(
const QskSlider* slider, QSGNode* node ) const const QskSlider* slider, QSGNode* node ) const
{ {
const QRectF decorationRect = subControlRect( slider, Slider::Decoration ); const QRectF decorationRect = subControlRect(
slider, slider->contentsRect(), Slider::Decoration );
if ( decorationRect.isEmpty() ) if ( decorationRect.isEmpty() )
return nullptr; return nullptr;
@ -317,11 +323,14 @@ QSGNode* SliderSkinlet::updateDecorationNode(
QSGNode* SliderSkinlet::updateHandleNode( QSGNode* SliderSkinlet::updateHandleNode(
const QskSlider* slider, QSGNode* node ) const const QskSlider* slider, QSGNode* node ) const
{ {
const QRectF handleRect = subControlRect( slider, QskSlider::Handle ); const QRectF handleRect = subControlRect(
slider, slider->contentsRect(), QskSlider::Handle );
if ( handleRect.isEmpty() ) if ( handleRect.isEmpty() )
return nullptr; return nullptr;
const QRectF fillRect = subControlRect( slider, QskSlider::Fill ); const QRectF fillRect = subControlRect(
slider, slider->contentsRect(), QskSlider::Fill );
auto handleNode = static_cast< HandleNode* >( node ); auto handleNode = static_cast< HandleNode* >( node );
if ( handleNode == nullptr ) if ( handleNode == nullptr )

10
examples/sliders/SliderSkinlet.h
View File

@ -26,7 +26,7 @@ class SliderSkinlet : public QskSliderSkinlet
~SliderSkinlet() override; ~SliderSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
@ -37,10 +37,10 @@ class SliderSkinlet : public QskSliderSkinlet
QSGNode* updateDecorationNode( const QskSlider*, QSGNode* ) const; QSGNode* updateDecorationNode( const QskSlider*, QSGNode* ) const;
QSGNode* updateHandleNode( const QskSlider*, QSGNode* ) const; QSGNode* updateHandleNode( const QskSlider*, QSGNode* ) const;
QRectF fillRect( const QskSlider* ) const; QRectF scaleRect( const QRectF& ) const;
QRectF scaleRect( const QskSlider* ) const; QRectF fillRect( const QskSlider*, const QRectF& ) const;
QRectF decorationRect( const QskSlider* ) const; QRectF decorationRect( const QskSlider*, const QRectF& ) const;
QRectF handleRect( const QskSlider* ) const; QRectF handleRect( const QskSlider*, const QRectF& ) const;
}; };
#endif #endif

9
src/controls/QskBoxSkinlet.cpp
View File

@ -16,16 +16,15 @@ QskBoxSkinlet::~QskBoxSkinlet()
{ {
} }
QRectF QskBoxSkinlet::subControlRect( QRectF QskBoxSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
if ( subControl == QskBox::Panel ) if ( subControl == QskBox::Panel )
{ {
const auto box = static_cast< const QskBox* >( skinnable ); return contentsRect;
return box->contentsRect();
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskBoxSkinlet::updateSubNode( QSGNode* QskBoxSkinlet::updateSubNode(

2
src/controls/QskBoxSkinlet.h
View File

@ -24,7 +24,7 @@ class QSK_EXPORT QskBoxSkinlet : public QskSkinlet
~QskBoxSkinlet() override; ~QskBoxSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,

6
src/controls/QskControl.cpp
View File

@ -11,6 +11,7 @@
#include "QskQuick.h" #include "QskQuick.h"
#include "QskSetup.h" #include "QskSetup.h"
#include "QskSkin.h" #include "QskSkin.h"
#include "QskSkinlet.h"
#include "QskSkinHintTable.h" #include "QskSkinHintTable.h"
#include <qglobalstatic.h> #include <qglobalstatic.h>
@ -1007,6 +1008,11 @@ QRectF QskControl::contentsRect() const
return qskValidOrEmptyInnerRect( rect(), margins() ); return qskValidOrEmptyInnerRect( rect(), margins() );
} }
QRectF QskControl::subControlRect( QskAspect::Subcontrol subControl ) const
{
return effectiveSkinlet()->subControlRect( this, contentsRect(), subControl );
}
bool QskControl::layoutMirroring() const bool QskControl::layoutMirroring() const
{ {
return d_func()->effectiveLayoutMirror; return d_func()->effectiveLayoutMirror;

2
src/controls/QskControl.h
View File

@ -115,6 +115,8 @@ class QSK_EXPORT QskControl : public QQuickItem, public QskSkinnable
virtual QRectF gestureRect() const; virtual QRectF gestureRect() const;
virtual QRectF focusIndicatorRect() const; virtual QRectF focusIndicatorRect() const;
QRectF subControlRect( QskAspect::Subcontrol ) const;
void setAutoFillBackground( bool ); void setAutoFillBackground( bool );
bool autoFillBackground() const; bool autoFillBackground() const;

10
src/controls/QskFocusIndicatorSkinlet.cpp
View File

@ -14,17 +14,15 @@ QskFocusIndicatorSkinlet::QskFocusIndicatorSkinlet( QskSkin* skin )
QskFocusIndicatorSkinlet::~QskFocusIndicatorSkinlet() = default; QskFocusIndicatorSkinlet::~QskFocusIndicatorSkinlet() = default;
QRectF QskFocusIndicatorSkinlet::subControlRect( QRectF QskFocusIndicatorSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto indicator = static_cast< const QskFocusIndicator* >( skinnable );
if ( subControl == QskFocusIndicator::Panel ) if ( subControl == QskFocusIndicator::Panel )
{ {
return indicator->rect(); return contentsRect;
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskFocusIndicatorSkinlet::updateSubNode( QSGNode* QskFocusIndicatorSkinlet::updateSubNode(

2
src/controls/QskFocusIndicatorSkinlet.h
View File

@ -26,7 +26,7 @@ class QSK_EXPORT QskFocusIndicatorSkinlet : public QskSkinlet
~QskFocusIndicatorSkinlet() override; ~QskFocusIndicatorSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,

15
src/controls/QskGraphicLabelSkinlet.cpp
View File

@ -20,17 +20,17 @@ QskGraphicLabelSkinlet::QskGraphicLabelSkinlet( QskSkin* skin )
QskGraphicLabelSkinlet::~QskGraphicLabelSkinlet() = default; QskGraphicLabelSkinlet::~QskGraphicLabelSkinlet() = default;
QRectF QskGraphicLabelSkinlet::subControlRect( QRectF QskGraphicLabelSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto label = static_cast< const QskGraphicLabel* >( skinnable ); const auto label = static_cast< const QskGraphicLabel* >( skinnable );
if ( subControl == QskGraphicLabel::Graphic ) if ( subControl == QskGraphicLabel::Graphic )
{ {
return graphicRect( label ); return graphicRect( label, contentsRect );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskGraphicLabelSkinlet::updateSubNode( QSGNode* QskGraphicLabelSkinlet::updateSubNode(
@ -49,14 +49,15 @@ QSGNode* QskGraphicLabelSkinlet::updateSubNode(
return Inherited::updateSubNode( skinnable, nodeRole, node ); return Inherited::updateSubNode( skinnable, nodeRole, node );
} }
QRect QskGraphicLabelSkinlet::graphicRect( const QskGraphicLabel* label ) const QRect QskGraphicLabelSkinlet::graphicRect(
const QskGraphicLabel* label, const QRectF& contentsRect ) const
{ {
// textures are in integers, to avoid useless recalculations // textures are in integers, to avoid useless recalculations
// that finally will be rounded anyway, we calculate in integers // that finally will be rounded anyway, we calculate in integers
const auto fillMode = label->fillMode(); const auto fillMode = label->fillMode();
const QRect graphicRect = label->contentsRect().toAlignedRect(); const QRect graphicRect = contentsRect.toAlignedRect();
if ( fillMode == QskGraphicLabel::Stretch ) if ( fillMode == QskGraphicLabel::Stretch )
{ {
@ -82,7 +83,7 @@ QSGNode* QskGraphicLabelSkinlet::updateGraphicNode(
const QskGraphicLabel* label, QSGNode* node ) const const QskGraphicLabel* label, QSGNode* node ) const
{ {
const auto colorFilter = label->graphicFilter(); const auto colorFilter = label->graphicFilter();
const auto rect = subControlRect( label, QskGraphicLabel::Graphic ); const auto rect = label->subControlRect( QskGraphicLabel::Graphic );
if ( label->fillMode() == QskGraphicLabel::Stretch ) if ( label->fillMode() == QskGraphicLabel::Stretch )
{ {

4
src/controls/QskGraphicLabelSkinlet.h
View File

@ -26,14 +26,14 @@ class QSK_EXPORT QskGraphicLabelSkinlet : public QskSkinlet
~QskGraphicLabelSkinlet() override; ~QskGraphicLabelSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:
QRect graphicRect( const QskGraphicLabel* ) const; QRect graphicRect( const QskGraphicLabel*, const QRectF& ) const;
QSGNode* updateGraphicNode( const QskGraphicLabel*, QSGNode* ) const; QSGNode* updateGraphicNode( const QskGraphicLabel*, QSGNode* ) const;
}; };

12
src/controls/QskPageIndicatorSkinlet.cpp
View File

@ -18,17 +18,15 @@ QskPageIndicatorSkinlet::~QskPageIndicatorSkinlet()
{ {
} }
QRectF QskPageIndicatorSkinlet::subControlRect( QRectF QskPageIndicatorSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto indicator = static_cast< const QskPageIndicator* >( skinnable );
if ( subControl == QskPageIndicator::Panel ) if ( subControl == QskPageIndicator::Panel )
{ {
return indicator->contentsRect(); return contentsRect;
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskPageIndicatorSkinlet::updateSubNode( QSGNode* QskPageIndicatorSkinlet::updateSubNode(
@ -137,7 +135,7 @@ QSGNode* QskPageIndicatorSkinlet::updateBulletsNode(
if ( node == nullptr ) if ( node == nullptr )
node = new QSGNode(); node = new QSGNode();
QRectF rect = subControlRect( indicator, QskPageIndicator::Panel ); QRectF rect = indicator->subControlRect( QskPageIndicator::Panel );
rect = indicator->innerBox( QskPageIndicator::Panel, rect ); rect = indicator->innerBox( QskPageIndicator::Panel, rect );
// index of the highlighted bullet // index of the highlighted bullet

2
src/controls/QskPageIndicatorSkinlet.h
View File

@ -27,7 +27,7 @@ class QSK_EXPORT QskPageIndicatorSkinlet : public QskSkinlet
~QskPageIndicatorSkinlet() override; ~QskPageIndicatorSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,

6
src/controls/QskPopupSkinlet.cpp
View File

@ -14,15 +14,15 @@ QskPopupSkinlet::QskPopupSkinlet( QskSkin* skin )
QskPopupSkinlet::~QskPopupSkinlet() = default; QskPopupSkinlet::~QskPopupSkinlet() = default;
QRectF QskPopupSkinlet::subControlRect( QRectF QskPopupSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto popup = static_cast< const QskPopup* >( skinnable ); const auto popup = static_cast< const QskPopup* >( skinnable );
if ( subControl == QskPopup::Overlay ) if ( subControl == QskPopup::Overlay )
return popup->overlayRect(); return popup->overlayRect();
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskPopupSkinlet::updateSubNode( QSGNode* QskPopupSkinlet::updateSubNode(

2
src/controls/QskPopupSkinlet.h
View File

@ -26,7 +26,7 @@ class QSK_EXPORT QskPopupSkinlet : public QskSkinlet
~QskPopupSkinlet() override; ~QskPopupSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,

2
src/controls/QskPushButton.cpp
View File

@ -247,7 +247,7 @@ void QskPushButton::updateLayout()
QRectF QskPushButton::layoutRect() const QRectF QskPushButton::layoutRect() const
{ {
return innerBox( Panel, effectiveSkinlet()->subControlRect( this, Panel ) ); return innerBox( Panel, subControlRect( Panel ) );
} }
QSizeF QskPushButton::contentsSizeHint() const QSizeF QskPushButton::contentsSizeHint() const

28
src/controls/QskPushButtonSkinlet.cpp
View File

@ -20,25 +20,25 @@ QskPushButtonSkinlet::QskPushButtonSkinlet( QskSkin* skin )
QskPushButtonSkinlet::~QskPushButtonSkinlet() = default; QskPushButtonSkinlet::~QskPushButtonSkinlet() = default;
QRectF QskPushButtonSkinlet::subControlRect( QRectF QskPushButtonSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto button = static_cast< const QskPushButton* >( skinnable ); const auto button = static_cast< const QskPushButton* >( skinnable );
if ( subControl == QskPushButton::Text ) if ( subControl == QskPushButton::Text )
{ {
return textRect( button ); return textRect( button, contentsRect );
} }
else if ( subControl == QskPushButton::Graphic ) else if ( subControl == QskPushButton::Graphic )
{ {
return graphicRect( button ); return graphicRect( button, contentsRect );
} }
else if ( subControl == QskPushButton::Panel ) else if ( subControl == QskPushButton::Panel )
{ {
return button->contentsRect(); return contentsRect;
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskPushButtonSkinlet::updateSubNode( QSGNode* QskPushButtonSkinlet::updateSubNode(
@ -68,12 +68,13 @@ QSGNode* QskPushButtonSkinlet::updateSubNode(
return Inherited::updateSubNode( skinnable, nodeRole, node ); return Inherited::updateSubNode( skinnable, nodeRole, node );
} }
QRectF QskPushButtonSkinlet::textRect( const QskPushButton* button ) const QRectF QskPushButtonSkinlet::textRect(
const QskPushButton* button, const QRectF& contentsRect ) const
{ {
// buttonShift -> TODO // buttonShift -> TODO
QRectF r = button->innerBox( QskPushButton::Panel, QRectF r = button->innerBox( QskPushButton::Panel,
subControlRect( button, QskPushButton::Panel ) ); subControlRect( button, contentsRect, QskPushButton::Panel ) );
if ( button->hasGraphic() ) if ( button->hasGraphic() )
{ {
@ -87,14 +88,17 @@ QRectF QskPushButtonSkinlet::textRect( const QskPushButton* button ) const
return r; return r;
} }
QRectF QskPushButtonSkinlet::graphicRect( const QskPushButton* button ) const QRectF QskPushButtonSkinlet::graphicRect(
const QskPushButton* button, const QRectF& contentsRect ) const
{ {
// buttonShift -> TODO // buttonShift -> TODO
QRectF r = button->innerBox( QskPushButton::Panel, button->contentsRect() );
QRectF r = button->innerBox( QskPushButton::Panel,
subControlRect( button, contentsRect, QskPushButton::Panel ) );
if ( !button->text().isEmpty() ) if ( !button->text().isEmpty() )
{ {
qreal h = textRect( button ).height() + qreal h = textRect( button, contentsRect ).height() +
button->metric( QskPushButton::Panel | QskAspect::Spacing ); button->metric( QskPushButton::Panel | QskAspect::Spacing );
if ( h < r.height() ) if ( h < r.height() )
@ -149,7 +153,7 @@ QRectF QskPushButtonSkinlet::graphicRect( const QskPushButton* button ) const
QSGNode* QskPushButtonSkinlet::updateTextNode( QSGNode* QskPushButtonSkinlet::updateTextNode(
const QskPushButton* button, QSGNode* node ) const const QskPushButton* button, QSGNode* node ) const
{ {
const auto rect = subControlRect( button, QskPushButton::Text ).toAlignedRect(); const auto rect = button->subControlRect( QskPushButton::Text ).toAlignedRect();
const QFontMetricsF fm( button->effectiveFont( QskPushButton::Text ) ); const QFontMetricsF fm( button->effectiveFont( QskPushButton::Text ) );
if ( !button->clip() && ( rect.height() < fm.height() ) ) if ( !button->clip() && ( rect.height() < fm.height() ) )

6
src/controls/QskPushButtonSkinlet.h
View File

@ -28,15 +28,15 @@ class QSK_EXPORT QskPushButtonSkinlet : public QskSkinlet
~QskPushButtonSkinlet() override; ~QskPushButtonSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:
QRectF textRect( const QskPushButton* ) const; QRectF textRect( const QskPushButton*, const QRectF& ) const;
QRectF graphicRect( const QskPushButton* ) const; QRectF graphicRect( const QskPushButton*, const QRectF& ) const;
QSGNode* updateTextNode( const QskPushButton*, QSGNode* ) const; QSGNode* updateTextNode( const QskPushButton*, QSGNode* ) const;
}; };

50
src/controls/QskScrollViewSkinlet.cpp
View File

@ -47,43 +47,42 @@ QskScrollViewSkinlet::QskScrollViewSkinlet( QskSkin* skin )
QskScrollViewSkinlet::~QskScrollViewSkinlet() = default; QskScrollViewSkinlet::~QskScrollViewSkinlet() = default;
QRectF QskScrollViewSkinlet::subControlRect( QRectF QskScrollViewSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto scrollView = static_cast< const QskScrollView* >( skinnable ); const auto scrollView = static_cast< const QskScrollView* >( skinnable );
if ( subControl == QskScrollView::Panel ) if ( subControl == QskScrollView::Panel )
{ {
// layoutRect ??? return contentsRect;
return scrollView->contentsRect();
} }
if ( subControl == QskScrollView::Viewport ) if ( subControl == QskScrollView::Viewport )
{ {
return viewportRect( scrollView ); return viewportRect( scrollView, contentsRect );
} }
if ( subControl == QskScrollView::HorizontalScrollBar ) if ( subControl == QskScrollView::HorizontalScrollBar )
{ {
return scrollBarRect( scrollView, Qt::Horizontal ); return scrollBarRect( scrollView, contentsRect, Qt::Horizontal );
} }
if ( subControl == QskScrollView::HorizontalScrollHandle ) if ( subControl == QskScrollView::HorizontalScrollHandle )
{ {
return scrollHandleRect( scrollView, Qt::Horizontal ); return scrollHandleRect( scrollView, contentsRect, Qt::Horizontal );
} }
if ( subControl == QskScrollView::VerticalScrollBar ) if ( subControl == QskScrollView::VerticalScrollBar )
{ {
return scrollBarRect( scrollView, Qt::Vertical ); return scrollBarRect( scrollView, contentsRect, Qt::Vertical );
} }
if ( subControl == QskScrollView::VerticalScrollHandle ) if ( subControl == QskScrollView::VerticalScrollHandle )
{ {
return scrollHandleRect( scrollView, Qt::Vertical ); return scrollHandleRect( scrollView, contentsRect, Qt::Vertical );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskScrollViewSkinlet::updateSubNode( QSGNode* QskScrollViewSkinlet::updateSubNode(
@ -182,23 +181,28 @@ QSGNode* QskScrollViewSkinlet::contentsNode( const QskScrollView* scrollView )
return nullptr; return nullptr;
} }
QRectF QskScrollViewSkinlet::viewportRect( const QskScrollView* scrollView ) const QRectF QskScrollViewSkinlet::viewportRect(
const QskScrollView* scrollView, const QRectF& contentsRect ) const
{ {
const Qt::Orientations orientation = scrollView->scrollableOrientations(); const Qt::Orientations orientation = scrollView->scrollableOrientations();
QRectF vr = subControlRect( scrollView, QskScrollView::Panel ); QRectF vr = subControlRect( scrollView, contentsRect, QskScrollView::Panel );
const qreal spacing = scrollView->metric( QskScrollView::Panel | QskAspect::Spacing ); const qreal spacing = scrollView->metric( QskScrollView::Panel | QskAspect::Spacing );
if ( orientation & Qt::Vertical ) if ( orientation & Qt::Vertical )
{ {
const QRectF r = subControlRect( scrollView, QskScrollView::VerticalScrollBar ); const QRectF r = subControlRect(
scrollView, contentsRect, QskScrollView::VerticalScrollBar );
if ( r.width() > 0.0 ) if ( r.width() > 0.0 )
vr.setWidth( vr.width() - r.width() - spacing ); vr.setWidth( vr.width() - r.width() - spacing );
} }
if ( orientation & Qt::Horizontal ) if ( orientation & Qt::Horizontal )
{ {
const QRectF r = subControlRect( scrollView, QskScrollView::HorizontalScrollBar ); const QRectF r = subControlRect(
scrollView, contentsRect, QskScrollView::HorizontalScrollBar );
if ( r.height() >= 0.0 ) if ( r.height() >= 0.0 )
vr.setHeight( vr.height() - r.height() - spacing ); vr.setHeight( vr.height() - r.height() - spacing );
} }
@ -206,15 +210,17 @@ QRectF QskScrollViewSkinlet::viewportRect( const QskScrollView* scrollView ) con
return vr; return vr;
} }
QRectF QskScrollViewSkinlet::scrollHandleRect( QRectF QskScrollViewSkinlet::scrollHandleRect( const QskScrollView* scrollView,
const QskScrollView* scrollView, Qt::Orientation orientation ) const const QRectF& contentsRect, Qt::Orientation orientation ) const
{ {
const Qt::Orientations scrollOrientations = scrollView->scrollableOrientations(); const Qt::Orientations scrollOrientations = scrollView->scrollableOrientations();
if ( !( orientation & scrollOrientations ) ) if ( !( orientation & scrollOrientations ) )
return QRectF(); return QRectF();
const QPointF pos = scrollView->scrollPos(); const QPointF pos = scrollView->scrollPos();
const QRectF vRect = subControlRect( scrollView, QskScrollView::Viewport );
const QRectF vRect = subControlRect(
scrollView, contentsRect, QskScrollView::Viewport );
QRectF handleRect; QRectF handleRect;
@ -222,7 +228,7 @@ QRectF QskScrollViewSkinlet::scrollHandleRect(
{ {
const auto subControlBar = QskScrollView::VerticalScrollBar; const auto subControlBar = QskScrollView::VerticalScrollBar;
const QRectF sbRect = subControlRect( scrollView, subControlBar ); const QRectF sbRect = subControlRect( scrollView, contentsRect, subControlBar );
const QMarginsF padding = scrollView->marginsHint( subControlBar | QskAspect::Padding ); const QMarginsF padding = scrollView->marginsHint( subControlBar | QskAspect::Padding );
const qreal h = scrollView->scrollableSize().height(); const qreal h = scrollView->scrollableSize().height();
@ -245,7 +251,7 @@ QRectF QskScrollViewSkinlet::scrollHandleRect(
{ {
const auto subControlBar = QskScrollView::HorizontalScrollBar; const auto subControlBar = QskScrollView::HorizontalScrollBar;
const QRectF sbRect = subControlRect( scrollView, subControlBar ); const QRectF sbRect = subControlRect( scrollView, contentsRect, subControlBar );
const auto padding = scrollView->marginsHint( subControlBar | QskAspect::Padding ); const auto padding = scrollView->marginsHint( subControlBar | QskAspect::Padding );
const qreal w = scrollView->scrollableSize().width(); const qreal w = scrollView->scrollableSize().width();
@ -268,14 +274,14 @@ QRectF QskScrollViewSkinlet::scrollHandleRect(
return handleRect; return handleRect;
} }
QRectF QskScrollViewSkinlet::scrollBarRect( QRectF QskScrollViewSkinlet::scrollBarRect( const QskScrollView* scrollView,
const QskScrollView* scrollView, Qt::Orientation orientation ) const const QRectF& contentsRect, Qt::Orientation orientation ) const
{ {
const Qt::Orientations scrollOrientations = scrollView->scrollableOrientations(); const Qt::Orientations scrollOrientations = scrollView->scrollableOrientations();
if ( !( orientation & scrollOrientations ) ) if ( !( orientation & scrollOrientations ) )
return QRectF(); return QRectF();
QRectF r = subControlRect( scrollView, QskScrollView::Panel ); QRectF r = subControlRect( scrollView, contentsRect, QskScrollView::Panel );
if ( orientation == Qt::Horizontal ) if ( orientation == Qt::Horizontal )
{ {

8
src/controls/QskScrollViewSkinlet.h
View File

@ -33,7 +33,7 @@ class QSK_EXPORT QskScrollViewSkinlet : public QskSkinlet
~QskScrollViewSkinlet() override; ~QskScrollViewSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
@ -45,9 +45,9 @@ class QSK_EXPORT QskScrollViewSkinlet : public QskSkinlet
private: private:
QSGNode* updateContentsRootNode( const QskScrollView*, QSGNode* ) const; QSGNode* updateContentsRootNode( const QskScrollView*, QSGNode* ) const;
QRectF viewportRect( const QskScrollView* ) const; QRectF viewportRect( const QskScrollView*, const QRectF& ) const;
QRectF scrollBarRect( const QskScrollView*, Qt::Orientation ) const; QRectF scrollBarRect( const QskScrollView*, const QRectF&, Qt::Orientation ) const;
QRectF scrollHandleRect( const QskScrollView*, Qt::Orientation ) const; QRectF scrollHandleRect( const QskScrollView*, const QRectF&, Qt::Orientation ) const;
}; };
#endif #endif

18
src/controls/QskSeparatorSkinlet.cpp
View File

@ -16,17 +16,17 @@ QskSeparatorSkinlet::QskSeparatorSkinlet( QskSkin* skin )
QskSeparatorSkinlet::~QskSeparatorSkinlet() = default; QskSeparatorSkinlet::~QskSeparatorSkinlet() = default;
QRectF QskSeparatorSkinlet::subControlRect( QRectF QskSeparatorSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto separator = static_cast< const QskSeparator* >( skinnable ); const auto separator = static_cast< const QskSeparator* >( skinnable );
if ( subControl == QskSeparator::Panel ) if ( subControl == QskSeparator::Panel )
{ {
return panelRect( separator ); return panelRect( separator, contentsRect );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskSeparatorSkinlet::updateSubNode( QSGNode* QskSeparatorSkinlet::updateSubNode(
@ -45,25 +45,25 @@ QSGNode* QskSeparatorSkinlet::updateSubNode(
return Inherited::updateSubNode( skinnable, nodeRole, node ); return Inherited::updateSubNode( skinnable, nodeRole, node );
} }
QRectF QskSeparatorSkinlet::panelRect( const QskSeparator* separator ) const QRectF QskSeparatorSkinlet::panelRect(
const QskSeparator* separator, const QRectF& contentsRect ) const
{ {
const QRectF cr = separator->contentsRect();
const qreal m = separator->metric( QskSeparator::Panel | QskAspect::Size ); const qreal m = separator->metric( QskSeparator::Panel | QskAspect::Size );
QRectF r; QRectF r;
if ( separator->orientation() == Qt::Horizontal ) if ( separator->orientation() == Qt::Horizontal )
{ {
r.setWidth( cr.width() ); r.setWidth( contentsRect.width() );
r.setHeight( m ); r.setHeight( m );
} }
else else
{ {
r.setHeight( cr.height() ); r.setHeight( contentsRect.height() );
r.setWidth( m ); r.setWidth( m );
} }
r.moveCenter( cr.center() ); r.moveCenter( contentsRect.center() );
return r; return r;
} }

4
src/controls/QskSeparatorSkinlet.h
View File

@ -26,14 +26,14 @@ class QSK_EXPORT QskSeparatorSkinlet : public QskSkinlet
~QskSeparatorSkinlet() override; ~QskSeparatorSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF& rect, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:
QRectF panelRect( const QskSeparator* ) const; QRectF panelRect( const QskSeparator*, const QRectF& rect ) const;
}; };
#endif #endif

20
src/controls/QskSkinlet.cpp
View File

@ -57,6 +57,18 @@ static inline QSGNode* qskFindNodeByFlag( QSGNode* parent, int nodeRole )
return nullptr; return nullptr;
} }
static inline QRectF qskSubControlRect( const QskSkinlet* skinlet,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl )
{
if ( auto control = skinnable->controlCast() )
{
const auto r = control->contentsRect();
return skinlet->subControlRect( skinnable, r, subControl );
}
return QRectF();
}
static inline QSGNode* qskUpdateGraphicNode( static inline QSGNode* qskUpdateGraphicNode(
const QskSkinnable* skinnable, QSGNode* node, const QskSkinnable* skinnable, QSGNode* node,
const QskGraphic& graphic, const QskColorFilter& colorFilter, const QskGraphic& graphic, const QskColorFilter& colorFilter,
@ -386,7 +398,7 @@ QSGNode* QskSkinlet::findNodeByRole( QSGNode* parent, quint8 nodeRole )
QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable, QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
QSGNode* node, QskAspect::Subcontrol subControl ) const QSGNode* node, QskAspect::Subcontrol subControl ) const
{ {
const QRectF rect = subControlRect( skinnable, subControl ); const QRectF rect = qskSubControlRect( this, skinnable, subControl );
return updateBoxNode( skinnable, node, rect, subControl ); return updateBoxNode( skinnable, node, rect, subControl );
} }
@ -425,7 +437,7 @@ QSGNode* QskSkinlet::updateBoxNode( const QskSkinnable* skinnable,
QSGNode* QskSkinlet::updateBoxClipNode( const QskSkinnable* skinnable, QSGNode* QskSkinlet::updateBoxClipNode( const QskSkinnable* skinnable,
QSGNode* node, QskAspect::Subcontrol subControl ) const QSGNode* node, QskAspect::Subcontrol subControl ) const
{ {
const QRectF rect = subControlRect( skinnable, subControl ); const QRectF rect = qskSubControlRect( this, skinnable, subControl );
return updateBoxClipNode( skinnable, node, rect, subControl ); return updateBoxClipNode( skinnable, node, rect, subControl );
} }
@ -513,7 +525,7 @@ QSGNode* QskSkinlet::updateTextNode(
const QString& text, const QskTextOptions& textOptions, const QString& text, const QskTextOptions& textOptions,
QskAspect::Subcontrol subControl ) const QskAspect::Subcontrol subControl ) const
{ {
const QRectF rect = subControlRect( skinnable, subControl ); const QRectF rect = qskSubControlRect( this, skinnable, subControl );
const auto alignment = skinnable->flagHint< Qt::Alignment >( const auto alignment = skinnable->flagHint< Qt::Alignment >(
QskAspect::Alignment | subControl, Qt::AlignLeft ); QskAspect::Alignment | subControl, Qt::AlignLeft );
@ -525,7 +537,7 @@ QSGNode* QskSkinlet::updateGraphicNode(
const QskSkinnable* skinnable, QSGNode* node, const QskSkinnable* skinnable, QSGNode* node,
const QskGraphic& graphic, QskAspect::Subcontrol subcontrol ) const const QskGraphic& graphic, QskAspect::Subcontrol subcontrol ) const
{ {
const QRectF rect = subControlRect( skinnable, subcontrol ); const QRectF rect = qskSubControlRect( this, skinnable, subcontrol );
const Qt::Alignment alignment = skinnable->flagHint< Qt::Alignment >( const Qt::Alignment alignment = skinnable->flagHint< Qt::Alignment >(
subcontrol | QskAspect::Alignment, Qt::AlignCenter ); subcontrol | QskAspect::Alignment, Qt::AlignCenter );

6
src/controls/QskSkinlet.h
View File

@ -38,7 +38,9 @@ class QSK_EXPORT QskSkinlet
QskSkin* skin() const; QskSkin* skin() const;
void updateNode( QskSkinnable*, QSGNode* parent ) const; void updateNode( QskSkinnable*, QSGNode* parent ) const;
virtual QRectF subControlRect( const QskSkinnable*, QskAspect::Subcontrol ) const;
virtual QRectF subControlRect(
const QskSkinnable*, const QRectF&, QskAspect::Subcontrol ) const;
const QVector< quint8 >& nodeRoles() const; const QVector< quint8 >& nodeRoles() const;
@ -105,7 +107,7 @@ class QSK_EXPORT QskSkinlet
}; };
inline QRectF QskSkinlet::subControlRect( inline QRectF QskSkinlet::subControlRect(
const QskSkinnable*, QskAspect::Subcontrol ) const const QskSkinnable*, const QRectF&, QskAspect::Subcontrol ) const
{ {
return QRectF(); return QRectF();
} }

5
src/controls/QskSkinnable.cpp
View File

@ -886,11 +886,6 @@ QskAspect::Subcontrol QskSkinnable::effectiveSubcontrol(
return subControl; return subControl;
} }
QRectF QskSkinnable::subControlRect( QskAspect::Subcontrol subControl ) const
{
return effectiveSkinlet()->subControlRect( this, subControl );
}
QskControl* QskSkinnable::controlCast() QskControl* QskSkinnable::controlCast()
{ {
return qskIsControl( this ) return qskIsControl( this )

2
src/controls/QskSkinnable.h
View File

@ -134,8 +134,6 @@ class QSK_EXPORT QskSkinnable
QMarginsF innerPadding( QskAspect::Aspect, const QSizeF& ) const; QMarginsF innerPadding( QskAspect::Aspect, const QSizeF& ) const;
QRectF subControlRect( QskAspect::Subcontrol ) const;
virtual const QskSkinlet* effectiveSkinlet() const; virtual const QskSkinlet* effectiveSkinlet() const;
QskSkin* effectiveSkin() const; QskSkin* effectiveSkin() const;

49
src/controls/QskSliderSkinlet.cpp
View File

@ -25,37 +25,37 @@ QskSliderSkinlet::QskSliderSkinlet( QskSkin* skin )
QskSliderSkinlet::~QskSliderSkinlet() = default; QskSliderSkinlet::~QskSliderSkinlet() = default;
QRectF QskSliderSkinlet::subControlRect( QRectF QskSliderSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto slider = static_cast< const QskSlider* >( skinnable ); const auto slider = static_cast< const QskSlider* >( skinnable );
if ( subControl == QskSlider::Panel ) if ( subControl == QskSlider::Panel )
{ {
return panelRect( slider ); return panelRect( slider, contentsRect );
} }
if ( subControl == QskSlider::Groove ) if ( subControl == QskSlider::Groove )
{ {
return grooveRect( slider ); return grooveRect( slider, contentsRect );
} }
if ( subControl == QskSlider::Fill ) if ( subControl == QskSlider::Fill )
{ {
return fillRect( slider ); return fillRect( slider, contentsRect );
} }
if ( subControl == QskSlider::Handle ) if ( subControl == QskSlider::Handle )
{ {
return handleRect( slider ); return handleRect( slider, contentsRect );
} }
if ( subControl == QskSlider::Scale ) if ( subControl == QskSlider::Scale )
{ {
return scaleRect( slider ); return scaleRect( slider, contentsRect );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskSliderSkinlet::updateSubNode( QSGNode* QskSliderSkinlet::updateSubNode(
@ -89,7 +89,8 @@ QSGNode* QskSliderSkinlet::updateSubNode(
return Inherited::updateSubNode( skinnable, nodeRole, node ); return Inherited::updateSubNode( skinnable, nodeRole, node );
} }
QRectF QskSliderSkinlet::panelRect( const QskSlider* slider ) const QRectF QskSliderSkinlet::panelRect(
const QskSlider* slider, const QRectF& contentsRect ) const
{ {
using namespace QskAspect; using namespace QskAspect;
@ -112,7 +113,7 @@ QRectF QskSliderSkinlet::panelRect( const QskSlider* slider ) const
size = qMin( size, maxSize ); size = qMin( size, maxSize );
} }
QRectF r = slider->contentsRect(); QRectF r = contentsRect;
if ( size > 0 && size < r.height() ) if ( size > 0 && size < r.height() )
{ {
@ -128,12 +129,12 @@ QRectF QskSliderSkinlet::panelRect( const QskSlider* slider ) const
return r; return r;
} }
QRectF QskSliderSkinlet::innerRect( QRectF QskSliderSkinlet::innerRect( const QskSlider* slider,
const QskSlider* slider, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
using namespace QskAspect; using namespace QskAspect;
QRectF r = subControlRect( slider, QskSlider::Panel ); QRectF r = subControlRect( slider, contentsRect, QskSlider::Panel );
r = r.marginsRemoved( qskPadding( slider, QskSlider::Panel ) ); r = r.marginsRemoved( qskPadding( slider, QskSlider::Panel ) );
QskSkinHintStatus status; QskSkinHintStatus status;
@ -160,27 +161,30 @@ QRectF QskSliderSkinlet::innerRect(
return r; return r;
} }
QRectF QskSliderSkinlet::grooveRect( const QskSlider* slider ) const QRectF QskSliderSkinlet::grooveRect(
const QskSlider* slider, const QRectF& rect ) const
{ {
return innerRect( slider, QskSlider::Groove ); return innerRect( slider, rect, QskSlider::Groove );
} }
QRectF QskSliderSkinlet::scaleRect( const QskSlider* slider ) const QRectF QskSliderSkinlet::scaleRect(
const QskSlider* slider, const QRectF& rect ) const
{ {
return innerRect( slider, QskSlider::Groove ); return innerRect( slider, rect, QskSlider::Groove );
} }
QRectF QskSliderSkinlet::fillRect( const QskSlider* slider ) const QRectF QskSliderSkinlet::fillRect(
const QskSlider* slider, const QRectF& contentsRect ) const
{ {
using namespace QskAspect; using namespace QskAspect;
QRectF r = subControlRect( slider, QskSlider::Panel ); QRectF r = subControlRect( slider, contentsRect, QskSlider::Panel );
r = r.marginsRemoved( qskPadding( slider, QskSlider::Panel ) ); r = r.marginsRemoved( qskPadding( slider, QskSlider::Panel ) );
qreal pos = slider->metric( QskSlider::Handle | Position ); qreal pos = slider->metric( QskSlider::Handle | Position );
pos = qBound( 0.0, pos, 1.0 ); pos = qBound( 0.0, pos, 1.0 );
QRectF fillRect = innerRect( slider, QskSlider::Fill ); QRectF fillRect = innerRect( slider, contentsRect, QskSlider::Fill );
if ( slider->orientation() == Qt::Horizontal ) if ( slider->orientation() == Qt::Horizontal )
{ {
fillRect.setLeft( r.left() ); fillRect.setLeft( r.left() );
@ -195,11 +199,12 @@ QRectF QskSliderSkinlet::fillRect( const QskSlider* slider ) const
return fillRect; return fillRect;
} }
QRectF QskSliderSkinlet::handleRect( const QskSlider* slider ) const QRectF QskSliderSkinlet::handleRect(
const QskSlider* slider, const QRectF& contentsRect ) const
{ {
using namespace QskAspect; using namespace QskAspect;
QRectF r = subControlRect( slider, QskSlider::Panel ); QRectF r = subControlRect( slider, contentsRect, QskSlider::Panel );
r = r.marginsRemoved( qskPadding( slider, QskSlider::Panel ) ); r = r.marginsRemoved( qskPadding( slider, QskSlider::Panel ) );
const bool isHorizontal = slider->orientation() == Qt::Horizontal; const bool isHorizontal = slider->orientation() == Qt::Horizontal;

14
src/controls/QskSliderSkinlet.h
View File

@ -29,20 +29,20 @@ class QSK_EXPORT QskSliderSkinlet : public QskSkinlet
~QskSliderSkinlet() override; ~QskSliderSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF& rect, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:
QRectF panelRect( const QskSlider* ) const; QRectF panelRect( const QskSlider*, const QRectF& ) const;
QRectF grooveRect( const QskSlider* ) const; QRectF grooveRect( const QskSlider*, const QRectF& ) const;
QRectF fillRect( const QskSlider* ) const; QRectF fillRect( const QskSlider*, const QRectF& ) const;
QRectF handleRect( const QskSlider* ) const; QRectF handleRect( const QskSlider*, const QRectF& ) const;
QRectF scaleRect( const QskSlider* ) const; QRectF scaleRect( const QskSlider*, const QRectF& ) const;
QRectF innerRect( const QskSlider*, QskAspect::Subcontrol ) const; QRectF innerRect( const QskSlider*, const QRectF&, QskAspect::Subcontrol ) const;
}; };
#endif #endif

14
src/controls/QskStatusIndicatorSkinlet.cpp
View File

@ -19,17 +19,17 @@ QskStatusIndicatorSkinlet::QskStatusIndicatorSkinlet( QskSkin* skin )
QskStatusIndicatorSkinlet::~QskStatusIndicatorSkinlet() = default; QskStatusIndicatorSkinlet::~QskStatusIndicatorSkinlet() = default;
QRectF QskStatusIndicatorSkinlet::subControlRect( QRectF QskStatusIndicatorSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto label = static_cast< const QskStatusIndicator* >( skinnable ); const auto label = static_cast< const QskStatusIndicator* >( skinnable );
if ( subControl == QskStatusIndicator::Graphic ) if ( subControl == QskStatusIndicator::Graphic )
{ {
return graphicRect( label ); return graphicRect( label, contentsRect );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskStatusIndicatorSkinlet::updateSubNode( QSGNode* QskStatusIndicatorSkinlet::updateSubNode(
@ -49,14 +49,14 @@ QSGNode* QskStatusIndicatorSkinlet::updateSubNode(
} }
QRect QskStatusIndicatorSkinlet::graphicRect( QRect QskStatusIndicatorSkinlet::graphicRect(
const QskStatusIndicator* indicator ) const const QskStatusIndicator* indicator, const QRectF& contentsRect ) const
{ {
// maybe we should have a common base class for // maybe we should have a common base class for
// QskStatusIndicator and QskGraphicLabel // QskStatusIndicator and QskGraphicLabel
// PreserveAspectFit/PreserveAspectCrop // PreserveAspectFit/PreserveAspectCrop
const QRect graphicRect = indicator->contentsRect().toAlignedRect(); const QRect graphicRect = contentsRect.toAlignedRect();
QSizeF sz = indicator->graphic( indicator->status() ).defaultSize(); QSizeF sz = indicator->graphic( indicator->status() ).defaultSize();
sz.scale( graphicRect.size(), Qt::KeepAspectRatio ); sz.scale( graphicRect.size(), Qt::KeepAspectRatio );
@ -70,7 +70,7 @@ QSGNode* QskStatusIndicatorSkinlet::updateGraphicNode(
{ {
const auto subControl = QskStatusIndicator::Graphic; const auto subControl = QskStatusIndicator::Graphic;
const QRectF rect = subControlRect( indicator, subControl ); const QRectF rect = subControlRect( indicator, indicator->contentsRect(), subControl );
const Qt::Alignment alignment = indicator->flagHint< Qt::Alignment >( const Qt::Alignment alignment = indicator->flagHint< Qt::Alignment >(
subControl | QskAspect::Alignment, Qt::AlignCenter ); subControl | QskAspect::Alignment, Qt::AlignCenter );

4
src/controls/QskStatusIndicatorSkinlet.h
View File

@ -26,14 +26,14 @@ class QSK_EXPORT QskStatusIndicatorSkinlet : public QskSkinlet
~QskStatusIndicatorSkinlet() override; ~QskStatusIndicatorSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:
QRect graphicRect( const QskStatusIndicator* ) const; QRect graphicRect( const QskStatusIndicator*, const QRectF& ) const;
QSGNode* updateGraphicNode( const QskStatusIndicator*, QSGNode* ) const; QSGNode* updateGraphicNode( const QskStatusIndicator*, QSGNode* ) const;
}; };

10
src/controls/QskSubWindowAreaSkinlet.cpp
View File

@ -14,15 +14,13 @@ QskSubWindowAreaSkinlet::QskSubWindowAreaSkinlet( QskSkin* skin )
QskSubWindowAreaSkinlet::~QskSubWindowAreaSkinlet() = default; QskSubWindowAreaSkinlet::~QskSubWindowAreaSkinlet() = default;
QRectF QskSubWindowAreaSkinlet::subControlRect( QRectF QskSubWindowAreaSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto area = static_cast< const QskSubWindowArea* >( skinnable );
if ( subControl == QskSubWindowArea::Panel ) if ( subControl == QskSubWindowArea::Panel )
return area->contentsRect(); return contentsRect;
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskSubWindowAreaSkinlet::updateSubNode( QSGNode* QskSubWindowAreaSkinlet::updateSubNode(

2
src/controls/QskSubWindowAreaSkinlet.h
View File

@ -26,7 +26,7 @@ class QSK_EXPORT QskSubWindowAreaSkinlet : public QskSkinlet
~QskSubWindowAreaSkinlet() override; ~QskSubWindowAreaSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,

37
src/controls/QskSubWindowSkinlet.cpp
View File

@ -21,29 +21,29 @@ QskSubWindowSkinlet::QskSubWindowSkinlet( QskSkin* skin )
QskSubWindowSkinlet::~QskSubWindowSkinlet() = default; QskSubWindowSkinlet::~QskSubWindowSkinlet() = default;
QRectF QskSubWindowSkinlet::subControlRect( QRectF QskSubWindowSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto subWindow = static_cast< const QskSubWindow* >( skinnable ); const auto subWindow = static_cast< const QskSubWindow* >( skinnable );
if ( subControl == QskSubWindow::Panel ) if ( subControl == QskSubWindow::Panel )
{ {
return subWindow->contentsRect(); return contentsRect;
} }
else if ( subControl == QskSubWindow::TitleBar ) else if ( subControl == QskSubWindow::TitleBar )
{ {
return titleBarRect( subWindow ); return titleBarRect( subWindow, contentsRect );
} }
else if ( subControl == QskSubWindow::TitleBarSymbol ) else if ( subControl == QskSubWindow::TitleBarSymbol )
{ {
return symbolRect( subWindow ); return symbolRect( subWindow, contentsRect );
} }
else if ( subControl == QskSubWindow::TitleBarText ) else if ( subControl == QskSubWindow::TitleBarText )
{ {
return titleRect( subWindow ); return titleRect( subWindow, contentsRect );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskSubWindowSkinlet::updateSubNode( QSGNode* QskSubWindowSkinlet::updateSubNode(
@ -89,14 +89,15 @@ QSGNode* QskSubWindowSkinlet::updateSubNode(
return Inherited::updateSubNode( skinnable, nodeRole, node ); return Inherited::updateSubNode( skinnable, nodeRole, node );
} }
QRectF QskSubWindowSkinlet::titleBarRect( const QskSubWindow* subWindow ) const QRectF QskSubWindowSkinlet::titleBarRect(
const QskSubWindow* subWindow, const QRectF& contentsRect ) const
{ {
const auto border = subWindow->boxBorderMetricsHint( QskSubWindow::Panel ); const auto border = subWindow->boxBorderMetricsHint( QskSubWindow::Panel );
QRectF rect = subWindow->contentsRect().marginsRemoved( border.widths() ); QRectF r = contentsRect.marginsRemoved( border.widths() );
rect.setHeight( titleBarHeight( subWindow ) ); r.setHeight( titleBarHeight( subWindow ) );
return rect; return r;
} }
qreal QskSubWindowSkinlet::titleBarHeight( const QskSubWindow* subWindow ) const qreal QskSubWindowSkinlet::titleBarHeight( const QskSubWindow* subWindow ) const
@ -115,9 +116,10 @@ qreal QskSubWindowSkinlet::titleBarHeight( const QskSubWindow* subWindow ) const
return qMax( height, minHeight ); return qMax( height, minHeight );
} }
QRectF QskSubWindowSkinlet::symbolRect( const QskSubWindow* subWindow ) const QRectF QskSubWindowSkinlet::symbolRect(
const QskSubWindow* subWindow, const QRectF& contentsRect ) const
{ {
auto rect = subControlRect( subWindow, QskSubWindow::TitleBar ); auto rect = subControlRect( subWindow, contentsRect, QskSubWindow::TitleBar );
rect = subWindow->innerBox( QskSubWindow::TitleBar, rect ); rect = subWindow->innerBox( QskSubWindow::TitleBar, rect );
int w = 0; int w = 0;
@ -134,9 +136,10 @@ QRectF QskSubWindowSkinlet::symbolRect( const QskSubWindow* subWindow ) const
return rect; return rect;
} }
QRectF QskSubWindowSkinlet::titleRect( const QskSubWindow* subWindow ) const QRectF QskSubWindowSkinlet::titleRect(
const QskSubWindow* subWindow, const QRectF& contentsRect ) const
{ {
auto rect = subControlRect( subWindow, QskSubWindow::TitleBar ); auto rect = subControlRect( subWindow, contentsRect, QskSubWindow::TitleBar );
rect = subWindow->innerBox( QskSubWindow::TitleBar, rect ); rect = subWindow->innerBox( QskSubWindow::TitleBar, rect );
if ( !rect.isEmpty() ) if ( !rect.isEmpty() )
@ -144,7 +147,9 @@ QRectF QskSubWindowSkinlet::titleRect( const QskSubWindow* subWindow ) const
const auto spacing = subWindow->metric( const auto spacing = subWindow->metric(
QskSubWindow::TitleBar | QskAspect::Spacing ); QskSubWindow::TitleBar | QskAspect::Spacing );
const auto symbolRect = subControlRect( subWindow, QskSubWindow::TitleBarSymbol ); const auto symbolRect = subControlRect(
subWindow, rect, QskSubWindow::TitleBarSymbol );
rect.setX( rect.x() + symbolRect.right() + spacing ); rect.setX( rect.x() + symbolRect.right() + spacing );
#if 0 #if 0

8
src/controls/QskSubWindowSkinlet.h
View File

@ -29,7 +29,7 @@ class QSK_EXPORT QskSubWindowSkinlet : public QskPopupSkinlet
~QskSubWindowSkinlet() override; ~QskSubWindowSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
@ -38,9 +38,9 @@ class QSK_EXPORT QskSubWindowSkinlet : public QskPopupSkinlet
private: private:
qreal titleBarHeight( const QskSubWindow* ) const; qreal titleBarHeight( const QskSubWindow* ) const;
QRectF titleBarRect( const QskSubWindow* ) const; QRectF titleBarRect( const QskSubWindow*, const QRectF& ) const;
QRectF symbolRect( const QskSubWindow* ) const; QRectF symbolRect( const QskSubWindow*, const QRectF& ) const;
QRectF titleRect( const QskSubWindow* ) const; QRectF titleRect( const QskSubWindow*, const QRectF& ) const;
}; };
#endif #endif

2
src/controls/QskTabButton.cpp
View File

@ -103,7 +103,7 @@ QSizeF QskTabButton::contentsSizeHint() const
QRectF QskTabButton::layoutRect() const QRectF QskTabButton::layoutRect() const
{ {
return innerBox( Panel, effectiveSkinlet()->subControlRect( this, Panel ) ); return innerBox( Panel, subControlRect( Panel ) );
} }
QskAspect::Placement QskTabButton::effectivePlacement() const QskAspect::Placement QskTabButton::effectivePlacement() const

14
src/controls/QskTabButtonSkinlet.cpp
View File

@ -16,24 +16,24 @@ QskTabButtonSkinlet::QskTabButtonSkinlet( QskSkin* skin )
QskTabButtonSkinlet::~QskTabButtonSkinlet() = default; QskTabButtonSkinlet::~QskTabButtonSkinlet() = default;
QRectF QskTabButtonSkinlet::subControlRect( QRectF QskTabButtonSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
auto tabButton = static_cast< const QskTabButton* >( skinnable ); auto tabButton = static_cast< const QskTabButton* >( skinnable );
if ( subControl == QskTabButton::Text ) if ( subControl == QskTabButton::Text )
{ {
QRectF rect = subControlRect( tabButton, QskTabButton::Panel ); auto r = subControlRect( tabButton, contentsRect, QskTabButton::Panel );
rect = tabButton->innerBox( QskTabButton::Panel, rect ); r = tabButton->innerBox( QskTabButton::Panel, r );
return rect; return r;
} }
else if ( subControl == QskTabButton::Panel ) else if ( subControl == QskTabButton::Panel )
{ {
return tabButton->contentsRect(); return contentsRect;
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskTabButtonSkinlet::updateSubNode( QSGNode* QskTabButtonSkinlet::updateSubNode(

2
src/controls/QskTabButtonSkinlet.h
View File

@ -25,7 +25,7 @@ class QSK_EXPORT QskTabButtonSkinlet : public QskSkinlet
~QskTabButtonSkinlet() override; ~QskTabButtonSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF& rect, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,

20
src/controls/QskTabViewSkinlet.cpp
View File

@ -16,22 +16,22 @@ QskTabViewSkinlet::QskTabViewSkinlet( QskSkin* skin )
QskTabViewSkinlet::~QskTabViewSkinlet() = default; QskTabViewSkinlet::~QskTabViewSkinlet() = default;
QRectF QskTabViewSkinlet::subControlRect( QRectF QskTabViewSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto tabView = static_cast< const QskTabView* >( skinnable ); const auto tabView = static_cast< const QskTabView* >( skinnable );
if ( subControl == QskTabView::Page ) if ( subControl == QskTabView::Page )
{ {
return pageRect( tabView ); return pageRect( tabView, contentsRect );
} }
if ( subControl == QskTabView::TabBar ) if ( subControl == QskTabView::TabBar )
{ {
return tabBarRect( tabView ); return tabBarRect( tabView, contentsRect );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskTabViewSkinlet::updateSubNode( QSGNode* QskTabViewSkinlet::updateSubNode(
@ -48,9 +48,10 @@ QSGNode* QskTabViewSkinlet::updateSubNode(
return Inherited::updateSubNode( skinnable, nodeRole, node ); return Inherited::updateSubNode( skinnable, nodeRole, node );
} }
QRectF QskTabViewSkinlet::pageRect( const QskTabView* tabView ) const QRectF QskTabViewSkinlet::pageRect(
const QskTabView* tabView, const QRectF& rect ) const
{ {
const QRectF barRect = subControlRect( tabView, QskTabView::TabBar ); const QRectF barRect = subControlRect( tabView, rect, QskTabView::TabBar );
#if 1 #if 1
QRectF r = tabView->layoutRect(); QRectF r = tabView->layoutRect();
@ -78,8 +79,11 @@ QRectF QskTabViewSkinlet::pageRect( const QskTabView* tabView ) const
return r; return r;
} }
QRectF QskTabViewSkinlet::tabBarRect( const QskTabView* tabView ) const QRectF QskTabViewSkinlet::tabBarRect(
const QskTabView* tabView, const QRectF& rect ) const
{ {
Q_UNUSED( rect )
const QSizeF hint = tabView->tabBar()->sizeHint(); const QSizeF hint = tabView->tabBar()->sizeHint();
#if 1 #if 1

6
src/controls/QskTabViewSkinlet.h
View File

@ -26,15 +26,15 @@ class QSK_EXPORT QskTabViewSkinlet : public QskSkinlet
~QskTabViewSkinlet() override; ~QskTabViewSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF& rect, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,
quint8 nodeRole, QSGNode* ) const override; quint8 nodeRole, QSGNode* ) const override;
private: private:
QRectF pageRect( const QskTabView* ) const; QRectF pageRect( const QskTabView*, const QRectF& ) const;
QRectF tabBarRect( const QskTabView* ) const; QRectF tabBarRect( const QskTabView*, const QRectF& ) const;
}; };
#endif #endif

13
src/controls/QskTextInputSkinlet.cpp
View File

@ -16,21 +16,20 @@ QskTextInputSkinlet::~QskTextInputSkinlet()
{ {
} }
QRectF QskTextInputSkinlet::subControlRect( QRectF QskTextInputSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
if ( subControl == QskTextInput::Panel ) if ( subControl == QskTextInput::Panel )
{ {
const auto textInput = static_cast< const QskTextInput* >( skinnable ); return contentsRect;
return textInput->contentsRect();
} }
else if ( subControl == QskTextInput::Text ) else if ( subControl == QskTextInput::Text )
{ {
return skinnable->innerBox( QskTextInput::Panel, const auto r = subControlRect( skinnable, contentsRect, QskTextInput::Panel );
subControlRect( skinnable, QskTextInput::Panel ) ); return skinnable->innerBox( QskTextInput::Panel, r );
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskTextInputSkinlet::updateSubNode( QSGNode* QskTextInputSkinlet::updateSubNode(

2
src/controls/QskTextInputSkinlet.h
View File

@ -24,7 +24,7 @@ class QSK_EXPORT QskTextInputSkinlet : public QskSkinlet
~QskTextInputSkinlet() override; ~QskTextInputSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF& rect, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,

10
src/controls/QskTextLabelSkinlet.cpp
View File

@ -16,17 +16,15 @@ QskTextLabelSkinlet::QskTextLabelSkinlet( QskSkin* skin )
QskTextLabelSkinlet::~QskTextLabelSkinlet() = default; QskTextLabelSkinlet::~QskTextLabelSkinlet() = default;
QRectF QskTextLabelSkinlet::subControlRect( QRectF QskTextLabelSkinlet::subControlRect( const QskSkinnable* skinnable,
const QskSkinnable* skinnable, QskAspect::Subcontrol subControl ) const const QRectF& contentsRect, QskAspect::Subcontrol subControl ) const
{ {
const auto label = static_cast< const QskTextLabel* >( skinnable );
if ( subControl == QskTextLabel::Text ) if ( subControl == QskTextLabel::Text )
{ {
return label->contentsRect(); return contentsRect;
} }
return Inherited::subControlRect( skinnable, subControl ); return Inherited::subControlRect( skinnable, contentsRect, subControl );
} }
QSGNode* QskTextLabelSkinlet::updateSubNode( QSGNode* QskTextLabelSkinlet::updateSubNode(

2
src/controls/QskTextLabelSkinlet.h
View File

@ -24,7 +24,7 @@ class QSK_EXPORT QskTextLabelSkinlet : public QskSkinlet
~QskTextLabelSkinlet() override; ~QskTextLabelSkinlet() override;
QRectF subControlRect( const QskSkinnable*, QRectF subControlRect( const QskSkinnable*,
QskAspect::Subcontrol ) const override; const QRectF&, QskAspect::Subcontrol ) const override;
protected: protected:
QSGNode* updateSubNode( const QskSkinnable*, QSGNode* updateSubNode( const QskSkinnable*,