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

isVisibleToLayout added

This commit is contained in:
Uwe Rathmann 2019-09-06 19:57:25 +02:00
parent 3c84c13691
commit 9d79b2edf9
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/controls/QskControl.cpp
View File

@ -399,6 +399,12 @@ QskControl::LayoutHints QskControl::layoutHints() const
return static_cast< LayoutHints >( d_func()->layoutHints ); return static_cast< LayoutHints >( d_func()->layoutHints );
} }
bool QskControl::isVisibleToLayout() const
{
return !isTransparentForPositioner()
&& ( isVisibleToParent() || ( layoutHints() & RetainSizeWhenHidden ) );
}
void QskControl::setPreferredSize( const QSizeF& size ) void QskControl::setPreferredSize( const QSizeF& size )
{ {
setExplicitSizeHint( Qt::PreferredSize, size ); setExplicitSizeHint( Qt::PreferredSize, size );
@ -654,12 +660,6 @@ QSizeF QskControl::effectiveSizeHint(
we always have: minimum <= preferred <= maximum. we always have: minimum <= preferred <= maximum.
*/ */
#define DEBUG_NORMALIZE_HINTS 0
#if DEBUG_NORMALIZE_HINTS
const auto oldHint = hint;
#endif
if ( whichHint == Qt::MaximumSize ) if ( whichHint == Qt::MaximumSize )
{ {
const auto minimumHint = d->explicitSizeHint( Qt::MinimumSize ); const auto minimumHint = d->explicitSizeHint( Qt::MinimumSize );
@ -691,15 +691,6 @@ QSizeF QskControl::effectiveSizeHint(
hint.setHeight( qBound( minH, hint.height(), maxH ) ); hint.setHeight( qBound( minH, hint.height(), maxH ) );
} }
} }
#if DEBUG_NORMALIZE_HINTS
if ( hint != oldHint )
{
const auto minimumHint = d->explicitSizeHint( Qt::MinimumSize );
const auto maximumHint = d->explicitSizeHint( Qt::MaximumSize );
qDebug() << whichHint << minimumHint << oldHint << maximumHint << "->" << hint;
}
#endif
} }
return hint; return hint;

2
src/controls/QskControl.h
View File

@ -118,6 +118,8 @@ class QSK_EXPORT QskControl : public QskQuickItem, public QskSkinnable
void setLayoutHints( LayoutHints ); void setLayoutHints( LayoutHints );
LayoutHints layoutHints() const; LayoutHints layoutHints() const;
bool isVisibleToLayout() const;
void setMinimumSize( const QSizeF& ); void setMinimumSize( const QSizeF& );
void setMinimumSize( qreal width, qreal height ); void setMinimumSize( qreal width, qreal height );
void setMinimumWidth( qreal width ); void setMinimumWidth( qreal width );