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

sizeHint calculations moved to the skinlet

This commit is contained in:
Uwe Rathmann 2020-12-29 09:45:00 +01:00
parent 98343dec60
commit 0eadfa8fa2
55 changed files with 452 additions and 398 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/gallery/slider/CustomSlider.cpp
View File

@ -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 );

3
examples/gallery/slider/CustomSlider.h
View File

@ -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

11
examples/gallery/slider/CustomSliderSkinlet.cpp
View File

@ -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;
}

3
examples/gallery/slider/CustomSliderSkinlet.h
View File

@ -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;

4
examples/layouts/DynamicConstraintsPage.cpp
View File

@ -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 )

27
examples/mycontrols/MyToggleButton.cpp
View File

@ -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++ )

1
examples/mycontrols/MyToggleButton.h
View File

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

26
examples/mycontrols/MyToggleButtonSkinlet.cpp
View File

@ -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"

6
examples/mycontrols/MyToggleButtonSkinlet.h
View File

@ -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*,

9
src/controls/QskBox.cpp
View File

@ -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"

3
src/controls/QskBox.h
View File

@ -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;
};

11
src/controls/QskBoxSkinlet.cpp
View File

@ -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"

3
src/controls/QskBoxSkinlet.h
View File

@ -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;

5
src/controls/QskControl.cpp
View File

@ -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(

27
src/controls/QskGraphicLabel.cpp
View File

@ -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 )
{

3
src/controls/QskGraphicLabel.h
View File

@ -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;

27
src/controls/QskGraphicLabelSkinlet.cpp
View File

@ -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"

3
src/controls/QskGraphicLabelSkinlet.h
View File

@ -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;

17
src/controls/QskListView.cpp
View File

@ -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 )

1
src/controls/QskListView.h
View File

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

21
src/controls/QskListViewSkinlet.cpp
View File

@ -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"

3
src/controls/QskListViewSkinlet.h
View File

@ -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
{

45
src/controls/QskPageIndicator.cpp
View File

@ -97,49 +97,4 @@ void QskPageIndicator::setCurrentIndex( qreal index )
}
}
QSizeF QskPageIndicator::contentsSizeHint(
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const auto bulletSize = strutSizeHint( Bullet );
const auto maxSize = bulletSize.expandedTo( strutSizeHint( Highlighted ) );
const qreal spacing = spacingHint( Panel );
const int n = m_data->count;
qreal w = 0;
qreal h = 0;
if ( m_data->orientation == Qt::Horizontal )
{
if ( n > 0 )
{
w += maxSize.width();
if ( n > 1 )
w += ( n - 1 ) * ( bulletSize.width() + spacing );
}
h = maxSize.height();
}
else
{
if ( n > 0 )
{
h += maxSize.height();
if ( n > 1 )
h += ( n - 1 ) * ( bulletSize.height() + spacing );
}
w = maxSize.width();
}
const auto hint = outerBoxSize( Panel, QSizeF( w, h ) );
return hint.expandedTo( strutSizeHint( Panel ) );
}
#include "moc_QskPageIndicator.cpp"

3
src/controls/QskPageIndicator.h
View File

@ -49,9 +49,6 @@ class QSK_EXPORT QskPageIndicator : public QskControl
void setCount( int count );
void setCurrentIndex( qreal index );
protected:
QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
private:
class PrivateData;
std::unique_ptr< PrivateData > m_data;

51
src/controls/QskPageIndicatorSkinlet.cpp
View File

@ -172,4 +172,55 @@ QSGNode* QskPageIndicatorSkinlet::updateBulletsNode(
return node;
}
QSizeF QskPageIndicatorSkinlet::sizeHint( const QskSkinnable* skinnable,
Qt::SizeHint which, const QSizeF& ) const
{
using Q = QskPageIndicator;
if ( which != Qt::PreferredSize )
return QSizeF();
const auto indicator = static_cast< const QskPageIndicator* >( skinnable );
const auto bulletSize = indicator->strutSizeHint( Q::Bullet );
const auto maxSize = bulletSize.expandedTo(
indicator->strutSizeHint( Q::Highlighted ) );
const qreal spacing = indicator->spacingHint( Q::Panel );
const int n = indicator->count();
qreal w = 0;
qreal h = 0;
if ( indicator->orientation() == Qt::Horizontal )
{
if ( n > 0 )
{
w += maxSize.width();
if ( n > 1 )
w += ( n - 1 ) * ( bulletSize.width() + spacing );
}
h = maxSize.height();
}
else
{
if ( n > 0 )
{
h += maxSize.height();
if ( n > 1 )
h += ( n - 1 ) * ( bulletSize.height() + spacing );
}
w = maxSize.width();
}
const auto hint = indicator->outerBoxSize( Q::Panel, QSizeF( w, h ) );
return hint.expandedTo( indicator->strutSizeHint( Q::Panel ) );
}
#include "moc_QskPageIndicatorSkinlet.cpp"

3
src/controls/QskPageIndicatorSkinlet.h
View File

@ -29,6 +29,9 @@ class QSK_EXPORT QskPageIndicatorSkinlet : 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;

11
src/controls/QskProgressBar.cpp
View File

@ -266,17 +266,6 @@ qreal QskProgressBar::valueAsRatio() const
return valueAsRatio( m_data->value );
}
QSizeF QskProgressBar::contentsSizeHint( Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
if ( orientation() == Qt::Horizontal )
return QSizeF( -1, extent() );
else
return QSizeF( extent(), -1 );
}
void QskProgressBar::componentComplete()
{
Inherited::componentComplete();

1
src/controls/QskProgressBar.h
View File

@ -79,7 +79,6 @@ class QSK_EXPORT QskProgressBar : public QskBoundedControl
void originChanged( qreal );
protected:
QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
void componentComplete() override;
void itemChange( ItemChange, const ItemChangeData& ) override;

16
src/controls/QskProgressBarSkinlet.cpp
View File

@ -171,4 +171,20 @@ QRectF QskProgressBarSkinlet::barRect( const QskProgressBar* bar ) const
return rect;
}
QSizeF QskProgressBarSkinlet::sizeHint( const QskSkinnable* skinnable,
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const auto bar = static_cast< const QskProgressBar* >( skinnable );
const auto extent = bar->extent();
if ( bar->orientation() == Qt::Horizontal )
return QSizeF( -1, extent );
else
return QSizeF( extent, -1 );
}
#include "moc_QskProgressBarSkinlet.cpp"

3
src/controls/QskProgressBarSkinlet.h
View File

@ -31,6 +31,9 @@ class QSK_EXPORT QskProgressBarSkinlet : 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;

71
src/controls/QskPushButton.cpp
View File

@ -31,6 +31,17 @@ class QskPushButton::PrivateData
textOptions.setElideMode( Qt::ElideMiddle );
}
void ensureGraphic( const QskPushButton* button )
{
if ( isGraphicSourceDirty )
{
if ( !graphicSource.isEmpty() )
graphic = button->loadGraphic( graphicSource );
isGraphicSourceDirty = false;
}
}
QString text;
QskTextOptions textOptions;
@ -215,6 +226,7 @@ void QskPushButton::setGraphic( const QskGraphic& graphic )
QskGraphic QskPushButton::graphic() const
{
m_data->ensureGraphic( this );
return m_data->graphic;
}
@ -223,15 +235,9 @@ bool QskPushButton::hasGraphic() const
return !( graphic().isEmpty() && graphicSource().isEmpty() );
}
void QskPushButton::updateLayout()
void QskPushButton::updateResources()
{
if ( m_data->isGraphicSourceDirty )
{
if ( !m_data->graphicSource.isEmpty() )
m_data->graphic = loadGraphic( m_data->graphicSource );
m_data->isGraphicSourceDirty = false;
}
m_data->ensureGraphic( this );
}
QRectF QskPushButton::layoutRectForSize( const QSizeF& size ) const
@ -239,55 +245,6 @@ QRectF QskPushButton::layoutRectForSize( const QSizeF& size ) const
return innerBox( Panel, subControlRect( size, Panel ) );
}
QSizeF QskPushButton::contentsSizeHint( Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
QSizeF size( 0, 0 );
const QFontMetricsF fm( font() );
if ( !m_data->text.isEmpty() )
{
// in elide mode we might want to ignore the text width ???
size += fm.size( Qt::TextShowMnemonic, m_data->text );
}
if ( m_data->isGraphicSourceDirty )
{
if ( !m_data->graphicSource.isEmpty() )
m_data->graphic = loadGraphic( m_data->graphicSource );
m_data->isGraphicSourceDirty = false;
}
if ( !m_data->graphic.isEmpty() )
{
qreal w = m_data->graphicSourceSize.width();
qreal h = m_data->graphicSourceSize.height();
if ( ( w < 0.0 ) && ( h < 0.0 ) )
h = 1.5 * fm.height();
if ( w < 0 )
w = m_data->graphic.widthForHeight( h );
else if ( h < 0 )
h = m_data->graphic.heightForWidth( w );
const qreal padding = 2.0; // Graphic::Padding ???
size.rheight() += 2 * padding + h;
size.rwidth() = qMax( size.width(), w );
}
size = size.expandedTo( strutSizeHint( Panel ) );
size = outerBoxSize( Panel, size );
return size;
}
void QskPushButton::changeEvent( QEvent* event )
{
switch ( event->type() )

4
src/controls/QskPushButton.h
View File

@ -92,11 +92,9 @@ class QSK_EXPORT QskPushButton : public QskAbstractButton
void hoverLeaveEvent( QHoverEvent* ) override;
void changeEvent( QEvent* ) override;
void updateLayout() override;
void updateResources() override;
virtual QskGraphic loadGraphic( const QUrl& ) const;
QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
private:
class PrivateData;
std::unique_ptr< PrivateData > m_data;

62
src/controls/QskPushButtonSkinlet.cpp
View File

@ -165,4 +165,66 @@ QSGNode* QskPushButtonSkinlet::updateTextNode(
button->text(), button->textOptions(), QskPushButton::Text );
}
QSizeF QskPushButtonSkinlet::sizeHint( const QskSkinnable* skinnable,
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const auto button = static_cast< const QskPushButton* >( skinnable );
QSizeF size( 0, 0 );
const QFontMetricsF fm( button->font() );
if ( !button->text().isEmpty() )
{
// in elide mode we might want to ignore the text width ???
size += fm.size( Qt::TextShowMnemonic, button->text() );
}
if ( button->hasGraphic() )
{
const auto sz = button->graphicSourceSize();
qreal w = sz.width();
qreal h = sz.height();
if ( w < 0.0 || h < 0.0 )
{
const auto graphic = button->graphic();
if ( !graphic.isEmpty() )
{
if ( ( w < 0.0 ) && ( h < 0.0 ) )
{
// strutSizeHint( Graphic ) ???
h = 1.5 * fm.height();
}
if ( w < 0 )
{
w = graphic.widthForHeight( h );
}
else if ( h < 0 )
{
h = graphic.heightForWidth( w );
}
}
}
const qreal padding = 2.0; // paddingHint( Graphic ) ???
size.rheight() += 2 * padding + h;
size.rwidth() = qMax( size.width(), w );
}
size = size.expandedTo( button->strutSizeHint( QskPushButton::Panel ) );
size = button->outerBoxSize( QskPushButton::Panel, size );
return size;
}
#include "moc_QskPushButtonSkinlet.cpp"

3
src/controls/QskPushButtonSkinlet.h
View File

@ -30,6 +30,9 @@ class QSK_EXPORT QskPushButtonSkinlet : 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;

14
src/controls/QskSeparator.cpp
View File

@ -70,20 +70,6 @@ qreal QskSeparator::extent() const
return metric( Panel | QskAspect::Size );
}
QSizeF QskSeparator::contentsSizeHint(
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const qreal m = extent();
if ( m_orientation == Qt::Horizontal )
return QSizeF( -1, m );
else
return QSizeF( m, -1 );
}
QskAspect::Placement QskSeparator::effectivePlacement() const
{
return static_cast< QskAspect::Placement >( m_orientation );

3
src/controls/QskSeparator.h
View File

@ -41,9 +41,6 @@ class QSK_EXPORT QskSeparator : public QskControl
void orientationChanged( Qt::Orientation );
void extentChanged( qreal );
protected:
QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
private:
Qt::Orientation m_orientation;
};

16
src/controls/QskSeparatorSkinlet.cpp
View File

@ -67,4 +67,20 @@ QRectF QskSeparatorSkinlet::panelRect(
return r;
}
QSizeF QskSeparatorSkinlet::sizeHint( const QskSkinnable* skinnable,
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const auto separator = static_cast< const QskSeparator* >( skinnable );
const qreal extent = separator->extent();
if ( separator->orientation() == Qt::Horizontal )
return QSizeF( -1, extent );
else
return QSizeF( extent, -1 );
}
#include "moc_QskSeparatorSkinlet.cpp"

3
src/controls/QskSeparatorSkinlet.h
View File

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

17
src/controls/QskSkinlet.h
View File

@ -23,10 +23,6 @@ class QskTextOptions;
class QSGNode;
class QRectF;
class QRect;
class QSize;
class QSK_EXPORT QskSkinlet
{
Q_GADGET
@ -39,8 +35,11 @@ class QSK_EXPORT QskSkinlet
virtual void updateNode( QskSkinnable*, QSGNode* parent ) const;
virtual QRectF subControlRect(
const QskSkinnable*, const QRectF&, QskAspect::Subcontrol ) const;
virtual QRectF subControlRect( const QskSkinnable*,
const QRectF&, QskAspect::Subcontrol ) const;
virtual QSizeF sizeHint( const QskSkinnable*,
Qt::SizeHint, const QSizeF& ) const;
const QVector< quint8 >& nodeRoles() const;
@ -116,4 +115,10 @@ inline QSGNode* QskSkinlet::updateSubNode(
return nullptr;
}
inline QSizeF QskSkinlet::sizeHint(
const QskSkinnable*, Qt::SizeHint, const QSizeF& ) const
{
return QSizeF();
}
#endif

11
src/controls/QskSlider.cpp
View File

@ -111,17 +111,6 @@ void QskSlider::aboutToShow()
Inherited::aboutToShow();
}
QSizeF QskSlider::contentsSizeHint(
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const qreal extent = metric( QskSlider::Panel | QskAspect::Size );
return ( m_data->orientation == Qt::Horizontal )
? QSizeF( 4 * extent, extent ) : QSizeF( extent, 4 * extent );
}
QSizeF QskSlider::handleSize() const
{
return handleRect().size();

2
src/controls/QskSlider.h
View File

@ -56,8 +56,6 @@ class QSK_EXPORT QskSlider : public QskBoundedValueInput
void mouseMoveEvent( QMouseEvent* e ) override;
void mouseReleaseEvent( QMouseEvent* e ) override;
QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
QSizeF handleSize() const;
QRectF handleRect() const;

16
src/controls/QskSliderSkinlet.cpp
View File

@ -220,4 +220,20 @@ QRectF QskSliderSkinlet::handleRect(
return handleRect;
}
QSizeF QskSliderSkinlet::sizeHint( const QskSkinnable* skinnable,
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const auto slider = static_cast< const QskSlider* >( skinnable );
// strutSizeHint( ... ) ???
const qreal m1 = slider->metric( QskSlider::Panel | QskAspect::Size );
const qreal m2 = 4 * m1;
return ( slider->orientation() == Qt::Horizontal )
? QSizeF( m2, m1 ) : QSizeF( m1, m2 );
}
#include "moc_QskSliderSkinlet.cpp"

3
src/controls/QskSliderSkinlet.h
View File

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

17
src/controls/QskTabButton.cpp
View File

@ -87,23 +87,6 @@ QskTextOptions QskTabButton::textOptions() const
return m_data->textOptions;
}
QSizeF QskTabButton::contentsSizeHint(
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
auto size = strutSizeHint( Panel );
if ( !m_data->text.isEmpty() )
{
const QFontMetricsF fm( effectiveFont( Text ) );
size += fm.size( Qt::TextShowMnemonic, m_data->text );
}
return size;
}
QRectF QskTabButton::layoutRectForSize( const QSizeF& size ) const
{
return innerBox( Panel, subControlRect( size, Panel ) );

1
src/controls/QskTabButton.h
View File

@ -49,7 +49,6 @@ class QSK_EXPORT QskTabButton : public QskAbstractButton
protected:
void changeEvent( QEvent* ) override;
QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
private:
class PrivateData;

21
src/controls/QskTabButtonSkinlet.cpp
View File

@ -7,6 +7,7 @@
#include "QskTabButton.h"
#include "QskTextOptions.h"
#include <qfontmetrics.h>
QskTabButtonSkinlet::QskTabButtonSkinlet( QskSkin* skin )
: Inherited( skin )
@ -58,4 +59,24 @@ QSGNode* QskTabButtonSkinlet::updateSubNode(
return Inherited::updateSubNode( skinnable, nodeRole, node );
}
QSizeF QskTabButtonSkinlet::sizeHint( const QskSkinnable* skinnable,
Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const auto tabButton = static_cast< const QskTabButton* >( skinnable );
auto size = tabButton->strutSizeHint( QskTabButton::Panel );
const auto text = tabButton->text();
if ( !text.isEmpty() )
{
const QFontMetricsF fm( tabButton->effectiveFont( QskTabButton::Text ) );
size += fm.size( Qt::TextShowMnemonic, text );
}
return size;
}
#include "moc_QskTabButtonSkinlet.cpp"

3
src/controls/QskTabButtonSkinlet.h
View File

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

11
src/controls/QskTextInput.cpp
View File

@ -451,7 +451,7 @@ void QskTextInput::focusOutEvent( QFocusEvent* event )
Inherited::focusOutEvent( event );
}
QSizeF QskTextInput::contentsSizeHint( Qt::SizeHint which, const QSizeF& ) const
QSizeF QskTextInput::layoutSizeHint( Qt::SizeHint which, const QSizeF& ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
@ -460,11 +460,12 @@ QSizeF QskTextInput::contentsSizeHint( Qt::SizeHint which, const QSizeF& ) const
input->updateMetrics();
const qreal w = input->implicitWidth();
const qreal h = input->implicitHeight();
QSizeF hint( input->implicitWidth(), input->implicitHeight() );
const auto hint = outerBoxSize( Panel, QSizeF( w, h ) );
return hint.expandedTo( strutSizeHint( Panel ) );
hint = outerBoxSize( Panel, hint );
hint = hint.expandedTo( strutSizeHint( Panel ) );
return hint;
}
void QskTextInput::updateLayout()

2
src/controls/QskTextInput.h
View File

@ -201,7 +201,7 @@ class QSK_EXPORT QskTextInput : public QskControl
void keyPressEvent( QKeyEvent* ) override;
void keyReleaseEvent( QKeyEvent* ) override;
QSizeF contentsSizeHint( Qt::SizeHint, const QSizeF& ) const override;
QSizeF layoutSizeHint( Qt::SizeHint, const QSizeF& ) const override;
void updateLayout() override;
void updateNode( QSGNode* ) override;

92
src/controls/QskTextLabel.cpp
View File

@ -6,10 +6,6 @@
#include "QskTextLabel.h"
#include "QskAspect.h"
#include "QskTextOptions.h"
#include "QskTextRenderer.h"
#include <qfontmetrics.h>
#include <qmath.h>
QSK_SUBCONTROL( QskTextLabel, Panel )
QSK_SUBCONTROL( QskTextLabel, Text )
@ -24,18 +20,15 @@ class QskTextLabel::PrivateData
effectiveTextFormat = textOptions.format();
}
QskTextOptions effectiveOptions() const
inline QskTextOptions::TextFormat effectiveFormat() const
{
if ( textOptions.format() != QskTextOptions::AutoText )
return textOptions;
return textOptions.format();
if ( effectiveTextFormat == QskTextOptions::AutoText )
effectiveTextFormat = textOptions.effectiveFormat( text );
QskTextOptions options = textOptions;
options.setFormat( effectiveTextFormat );
return options;
return effectiveTextFormat;
}
QString text;
@ -140,6 +133,11 @@ QskTextOptions::TextFormat QskTextLabel::textFormat() const
return m_data->textOptions.format();
}
QskTextOptions::TextFormat QskTextLabel::effectiveTextFormat() const
{
return m_data->effectiveFormat();
}
void QskTextLabel::setWrapMode( QskTextOptions::WrapMode wrapMode )
{
auto options = m_data->textOptions;
@ -223,80 +221,6 @@ QFont QskTextLabel::font() const
return effectiveFont( QskTextLabel::Text );
}
QSizeF QskTextLabel::contentsSizeHint(
Qt::SizeHint which, const QSizeF& constraint ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const auto font = effectiveFont( Text );
QSizeF hint;
const qreal lineHeight = QFontMetricsF( font ).height();
if ( m_data->text.isEmpty() )
{
if ( constraint.height() < 0.0 )
hint.setHeight( qCeil( lineHeight ) );
}
else if ( constraint.width() >= 0.0 )
{
if ( m_data->textOptions.effectiveElideMode() != Qt::ElideNone )
{
hint.setHeight( qCeil( lineHeight ) );
}
else
{
/*
In case of QskTextOptions::NoWrap we could count
the line numbers and calculate the height from
lineHeight. TODO ...
*/
qreal maxHeight = std::numeric_limits< qreal >::max();
if ( maxHeight / lineHeight > m_data->textOptions.maximumLineCount() )
{
// be careful with overflows
maxHeight = m_data->textOptions.maximumLineCount() * lineHeight;
}
QSizeF size( constraint.width(), maxHeight );
size = QskTextRenderer::textSize(
m_data->text, font, m_data->effectiveOptions(), size );
if ( m_data->hasPanel )
size = outerBoxSize( Panel, size );
hint.setHeight( qCeil( size.height() ) );
}
}
else if ( constraint.height() >= 0.0 )
{
const qreal maxWidth = std::numeric_limits< qreal >::max();
QSizeF size( maxWidth, constraint.height() );
size = QskTextRenderer::textSize( m_data->text, font,
m_data->effectiveOptions(), size );
if ( m_data->hasPanel )
size = outerBoxSize( Panel, size );
hint.setWidth( qCeil( size.width() ) );
}
else
{
hint = QskTextRenderer::textSize(
m_data->text, font, m_data->effectiveOptions() );
if ( m_data->hasPanel )
hint = outerBoxSize( Panel, hint );
}
return hint;
}
void QskTextLabel::changeEvent( QEvent* event )
{
switch ( event->type() )

5
src/controls/QskTextLabel.h
View File

@ -58,6 +58,8 @@ class QSK_EXPORT QskTextLabel : public QskControl
void setTextFormat( QskTextOptions::TextFormat );
QskTextOptions::TextFormat textFormat() const;
QskTextOptions::TextFormat effectiveTextFormat() const;
void setWrapMode( QskTextOptions::WrapMode );
QskTextOptions::WrapMode wrapMode() const;
@ -87,9 +89,6 @@ class QSK_EXPORT QskTextLabel : public QskControl
protected:
void changeEvent( QEvent* ) override;
QSizeF contentsSizeHint(
Qt::SizeHint, const QSizeF& ) const override;
private:
class PrivateData;
std::unique_ptr< PrivateData > m_data;

82
src/controls/QskTextLabelSkinlet.cpp
View File

@ -7,6 +7,10 @@
#include "QskTextLabel.h"
#include "QskTextOptions.h"
#include "QskTextRenderer.h"
#include <qfontmetrics.h>
#include <qmath.h>
QskTextLabelSkinlet::QskTextLabelSkinlet( QskSkin* skin )
: Inherited( skin )
@ -63,4 +67,82 @@ QSGNode* QskTextLabelSkinlet::updateSubNode(
return Inherited::updateSubNode( skinnable, nodeRole, node );
}
QSizeF QskTextLabelSkinlet::sizeHint( const QskSkinnable* skinnable,
Qt::SizeHint which, const QSizeF& constraint ) const
{
if ( which != Qt::PreferredSize )
return QSizeF();
const auto label = static_cast< const QskTextLabel* >( skinnable );
const auto font = label->effectiveFont( QskTextLabel::Text );
auto textOptions = label->textOptions();
textOptions.setFormat( label->effectiveTextFormat() );
const auto text = label->text();
QSizeF hint;
const qreal lineHeight = QFontMetricsF( font ).height();
if ( text.isEmpty() )
{
if ( constraint.height() < 0.0 )
hint.setHeight( qCeil( lineHeight ) );
}
else if ( constraint.width() >= 0.0 )
{
if ( textOptions.effectiveElideMode() != Qt::ElideNone )
{
hint.setHeight( qCeil( lineHeight ) );
}
else
{
/*
In case of QskTextOptions::NoWrap we could count
the line numbers and calculate the height from
lineHeight. TODO ...
*/
qreal maxHeight = std::numeric_limits< qreal >::max();
if ( maxHeight / lineHeight > textOptions.maximumLineCount() )
{
// be careful with overflows
maxHeight = textOptions.maximumLineCount() * lineHeight;
}
QSizeF size( constraint.width(), maxHeight );
size = QskTextRenderer::textSize( text, font, textOptions, size );
if ( label->hasPanel() )
size = label->outerBoxSize( QskTextLabel::Panel, size );
hint.setHeight( qCeil( size.height() ) );
}
}
else if ( constraint.height() >= 0.0 )
{
const qreal maxWidth = std::numeric_limits< qreal >::max();
QSizeF size( maxWidth, constraint.height() );
size = QskTextRenderer::textSize( text, font, textOptions, size );
if ( label->hasPanel() )
size = label->outerBoxSize( QskTextLabel::Panel, size );
hint.setWidth( qCeil( size.width() ) );
}
else
{
hint = QskTextRenderer::textSize( text, font, textOptions );
if ( label->hasPanel() )
hint = label->outerBoxSize( QskTextLabel::Panel, hint );
}
return hint;
}
#include "moc_QskTextLabelSkinlet.cpp"

3
src/controls/QskTextLabelSkinlet.h
View File

@ -26,6 +26,9 @@ class QSK_EXPORT QskTextLabelSkinlet : 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;

15
src/dialogs/QskSelectionSubWindow.cpp
View File

@ -45,18 +45,6 @@ namespace
connect( this, &QskSimpleListBox::entriesChanged,
subWindow, &QskSelectionSubWindow::entriesChanged );
}
#if 1
// how to find a reasonable default size ???
QSizeF contentsSizeHint(
Qt::SizeHint which, const QSizeF& ) const override
{
if ( which == Qt::PreferredSize )
return QSizeF( 500, 500 );
return QSizeF();
}
#endif
};
}
@ -75,6 +63,9 @@ QskSelectionSubWindow::QskSelectionSubWindow( QQuickItem* parent )
m_data->textLabel->setVisible( false );
m_data->listBox = new ListBox( this );
#if 1
m_data->listBox->setPreferredSize( 500, 500 );
#endif
auto box = new QskLinearBox( Qt::Vertical );
box->setSpacing( 10 ); // hint

15
src/dialogs/QskSelectionWindow.cpp
View File

@ -48,18 +48,6 @@ namespace
connect( this, &QskSimpleListBox::entriesChanged,
window, &QskSelectionWindow::entriesChanged );
}
#if 1
// how to find a reasonable default size ???
QSizeF contentsSizeHint(
Qt::SizeHint which, const QSizeF& ) const override
{
if ( which == Qt::PreferredSize )
return QSizeF( 500, 500 );
return QSizeF();
}
#endif
};
}
@ -81,6 +69,9 @@ QskSelectionWindow::QskSelectionWindow( QWindow* parent )
m_data->textLabel->setVisible( false );
m_data->listBox = new ListBox( this );
#if 1
m_data->listBox->setPreferredSize( 500, 500 );
#endif
auto box = new QskLinearBox( Qt::Vertical );
box->setMargins( 5 );