diff --git a/doc/classes/QskControl.dox b/doc/classes/QskControl.dox index ee72dbc7..0a578f59 100644 --- a/doc/classes/QskControl.dox +++ b/doc/classes/QskControl.dox @@ -43,27 +43,6 @@ QQuickItem::focusOutEvent() */ -/*! - \enum QskControl::LayoutHint - - Hints, that can be used by the layout code - - \sa setLayoutHint(), testLayoutHint(), setLayoutHints(), layoutHints() - setAutoLayoutChildren(), QskLinearBox, QskGridBox, QskStackBox - - \var QskControl::RetainSizeWhenHidden - - When being enabled the layout code should retain the necessary space - for the control even when it is hidden. - - \saqt QSizePolicy::retainSizeWhenHidden() - - \var QskControl::LayoutWhenHidden - - When being enabled the layout code should set the geometry - to the control - even if it is not visible. -*/ - /*! \property QLocale QskControl::locale @@ -168,6 +147,14 @@ \property QskSizePolicy QskControl::sizePolicy \accessors sizePolicy(), setSizePolicy() + \sa placementPolicy +*/ + +/*! + \property QskPlacementPolicy QskControl::placementPolicy + + \accessors placementPolicy(), setPlacementPolicy() + \sa sizePolicy, effectivePlacementPolicy() */ /*! @@ -553,6 +540,40 @@ \return Height or width related part of the \ref sizePolicy property */ +/*! + \fn QskControl::setPlacementPolicy( QskPlacementPolicy ) + + \sa placementPolicy, effectivePlacementPolicy +*/ + +/*! + QskControl::setPlacementPolicy( QskPlacementPolicy::Policy, QskPlacementPolicy::Policy ) + + \sa placementPolicy, effectivePlacementPolicy + +/*! + void QskControl::setPlacementPolicy( Qsk::Visibilities, QskPlacementPolicy::Policy ); + + \sa placementPolicy, effectivePlacementPolicy() +*/ + +/*! + QskControl::placementPolicy() const; + + \sa placementPolicy, effectivePlacementPolicy() +*/ + +/*! + QskControl::placementPolicy( Qsk::Visibility ) const; + + \sa placementPolicy, effectivePlacementPolicy() +*/ + +/*! + QskControl::effectivePlacementPolicy() const; + +*/ + /*! \fn QskControl::setLayoutAlignmentHint @@ -563,26 +584,6 @@ */ -/*! - \fn QskControl::setLayoutHint - -*/ - -/*! - \fn QskControl::testLayoutHint - -*/ - -/*! - \fn QskControl::setLayoutHints - -*/ - -/*! - \fn QskControl::layoutHints - -*/ - /*! \fn QskControl::isVisibleToLayout diff --git a/src/controls/QskControl.h b/src/controls/QskControl.h index f59e541d..871343b9 100644 --- a/src/controls/QskControl.h +++ b/src/controls/QskControl.h @@ -47,6 +47,7 @@ class QSK_EXPORT QskControl : public QskQuickItem, public QskSkinnable WRITE setBackground RESET resetBackground NOTIFY backgroundChanged ) Q_PROPERTY( QskSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy ) + Q_PROPERTY( QskSizePolicy placementPolicy READ placementPolicy WRITE setPlacementPolicy ) Q_PROPERTY( QSizeF minimumSize READ minimumSize WRITE setMinimumSize ) Q_PROPERTY( QSizeF maximumSize READ maximumSize WRITE setMaximumSize )