FCL/sf/mw/qt: comparison src/declarative/graphicsitems/qdeclarativepositioners.cpp

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 positionedItems.copyAndClear(oldItems);
 for (int ii = 0; ii < children.count(); ++ii) {
 QDeclarativeItem *child = qobject_cast<QDeclarativeItem *>(children.at(ii));
 if (!child)
 continue;
+QDeclarativeItemPrivate *childPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(child));
 PositionedItem *item = 0;
 PositionedItem posItem(child);
 int wIdx = oldItems.find(posItem);
 if (wIdx < 0) {
 d->watchChanges(child);
 positionedItems.append(posItem);
 item = &positionedItems[positionedItems.count()-1];
 item->isNew = true;
-if (child->opacity() <= 0.0 || !child->isVisible())
+if (child->opacity() <= 0.0 || childPrivate->explicitlyHidden)
 item->isVisible = false;
 } else {
 item = &oldItems[wIdx];
-if (child->opacity() <= 0.0 || !child->isVisible()) {
+// Items are only omitted from positioning if they are explicitly hidden
+// i.e. their positioning is not affected if an ancestor is hidden.
+if (child->opacity() <= 0.0 || childPrivate->explicitlyHidden) {
 item->isVisible = false;
 } else if (!item->isVisible) {
 item->isVisible = true;
 item->isNew = true;
 } else {
 d->moveTransitionManager.transition(d->moveActions, d->moveTransition);
 d->addActions.clear();
 d->moveActions.clear();
 }
+static inline bool isInvisible(QDeclarativeItem *child)
+{
+QDeclarativeItemPrivate *childPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(child));
+return child->opacity() == 0.0 || childPrivate->explicitlyHidden || !child->width() || !child->height();
+}
 /*!
 \qmlclass Column QDeclarativeColumn
 \since 4.7
-\brief The Column item lines up its children vertically.
+\brief The Column item arranges its children vertically.
 \inherits Item
 The Column item positions its child items so that they are vertically
 aligned and not overlapping. Spacing between items can be added.
 Note that the positioner assumes that the x and y positions of its children
 will not change. If you manually change the x or y properties in script, bind
 the x or y properties, use anchors on a child of a positioner, or have the
 height of a child depend on the position of a child, then the
-positioner may exhibit strange behaviour.
+positioner may exhibit strange behaviour. If you need to perform any of these
+actions, consider positioning the items without the use of a Column.
+Items with a width or height of 0 will not be positioned.
+\sa Row, {declarative/positioners}{Positioners example}
 */
 /*!
 \qmlproperty Transition Column::add
 This property holds the transition to be applied when adding an
 \qmlproperty int Column::spacing
 spacing is the amount in pixels left empty between each adjacent
 item, and defaults to 0.
-The below example places a Grid containing a red, a blue and a
+The below example places a \l Grid containing a red, a blue and a
 green rectangle on a gray background. The area the grid positioner
 occupies is colored white. The top positioner has the default of no spacing,
 and the bottom positioner has its spacing set to 2.
 \image spacing_a.png
 \brief The QDeclarativeColumn class lines up items vertically.
 */
 QDeclarativeColumn::QDeclarativeColumn(QDeclarativeItem *parent)
 : QDeclarativeBasePositioner(Vertical, parent)
 {
-}
-static inline bool isInvisible(QDeclarativeItem *child)
-{
-return child->opacity() == 0.0 || !child->isVisible() || !child->width() || !child->height();
 }
 void QDeclarativeColumn::doPositioning(QSizeF *contentSize)
 {
 int voffset = 0;
 }
 /*!
 \qmlclass Row QDeclarativeRow
 \since 4.7
-\brief The Row item lines up its children horizontally.
+\brief The Row item arranges its children horizontally.
 \inherits Item
 The Row item positions its child items so that they are
-horizontally aligned and not overlapping. Spacing can be added between the
+horizontally aligned and not overlapping.
-items, and a margin around all items can also be added. It also provides for
-transitions to be set when items are added, moved, or removed in the
+Use \l spacing to set the spacing between items in a Row, and use the
-positioner. Adding and removing apply both to items which are deleted or have
+\l add and \l move properties to set the transitions that should be applied
-their position in the document changed so as to no longer be children of the
+when items are added to, removed from, or re-positioned within the Row.
-positioner, as well as to items which have their opacity set to or from zero
-so as to appear or disappear.
 The below example lays out differently shaped rectangles using a Row.
 \qml
 Row {
 spacing: 2
 Note that the positioner assumes that the x and y positions of its children
 will not change. If you manually change the x or y properties in script, bind
 the x or y properties, use anchors on a child of a positioner, or have the
 width of a child depend on the position of a child, then the
-positioner may exhibit strange behaviour.
+positioner may exhibit strange behaviour. If you need to perform any of these
+actions, consider positioning the items without the use of a Row.
+Items with a width or height of 0 will not be positioned.
+\sa Column, {declarative/positioners}{Positioners example}
 */
 /*!
 \qmlproperty Transition Row::add
 This property holds the transition to apply when adding an item to the positioner.
 The transition will only be applied to the added item(s).
 Positioner transitions will only affect the position (x,y) of items.
-Added can mean that either the object has been created or
+An object is considered to be added to the positioner if it has been
-reparented, and thus is now a child or the positioner, or that the
+created or reparented and thus is now a child or the positioner, or if the
 object has had its opacity increased from zero, and thus is now
 visible.
 */
 /*!
 \qmlproperty Transition Row::move
 This property holds the transition to apply when moving an item
 \qmlproperty int Row::spacing
 spacing is the amount in pixels left empty between each adjacent
 item, and defaults to 0.
-The below example places a Grid containing a red, a blue and a
+The below example places a \l Grid containing a red, a blue and a
 green rectangle on a gray background. The area the grid positioner
 occupies is colored white. The top positioner has the default of no spacing,
 and the bottom positioner has its spacing set to 2.
 \image spacing_a.png
 \since 4.7
 \brief The Grid item positions its children in a grid.
 \inherits Item
 The Grid item positions its child items so that they are
-aligned in a grid and are not overlapping. Spacing can be added
+aligned in a grid and are not overlapping.
-between the items. It also provides for transitions to be set when items are
+Spacing can be added
+between child items. It also provides for transitions to be set when items are
 added, moved, or removed in the positioner. Adding and removing apply
 both to items which are deleted or have their position in the
 document changed so as to no longer be children of the positioner, as
 well as to items which have their opacity set to or from zero so
 as to appear or disappear.
-The Grid defaults to using four columns, and as many rows as
+A Grid defaults to four columns, and as many rows as
-are necessary to fit all the child items. The number of rows
+are necessary to fit all child items. The number of rows
-and/or the number of columns can be constrained by setting the rows
+and/or the number of columns can be constrained by setting the \l rows
-or columns properties. The grid positioner calculates a grid with
+or \l columns properties. The grid positioner calculates a grid with
 rectangular cells of sufficient size to hold all items, and then
 places the items in the cells, going across then down, and
 positioning each item at the (0,0) corner of the cell. The below
 example demonstrates this.
 Note that the positioner assumes that the x and y positions of its children
 will not change. If you manually change the x or y properties in script, bind
 the x or y properties, use anchors on a child of a positioner, or have the
 width or height of a child depend on the position of a child, then the
-positioner may exhibit strange behaviour.
+positioner may exhibit strange behaviour. If you need to perform any of these
+actions, consider positioning the items without the use of a Grid.
+Items with a width or height of 0 will not be positioned.
+\sa Flow, {declarative/positioners}{Positioners example}
 */
 /*!
 \qmlproperty Transition Grid::add
 This property holds the transition to apply when adding an item to the positioner.
 The transition is only applied to the added item(s).
 Positioner transitions will only affect the position (x,y) of items,
 as that is all the positioners affect. To animate other property change
 you will have to do so based on how you have changed those properties.
-Added can mean that either the object has been created or
+An object is considered to be added to the positioner if it has been
-reparented, and thus is now a child or the positioner, or that the
+created or reparented and thus is now a child or the positioner, or if the
 object has had its opacity increased from zero, and thus is now
 visible.
 */
 /*!
 \qmlproperty Transition Grid::move
 This property holds the transition to apply when moving an item within the positioner.
 Positioner transitions will only affect the position (x,y) of items.
 /*!
 \qmlproperty int Grid::columns
 This property holds the number of columns in the grid.
-When the columns property is set the Grid will always have
+If the grid does not have enough items to fill the specified
-that many columns. Note that if you do not have enough items to
+number of columns, some columns will be of zero width.
-fill this many columns some columns will be of zero width.
 */
 /*!
 \qmlproperty int Grid::rows
 This property holds the number of rows in the grid.
-When the rows property is set the Grid will always have that
+If the grid does not have enough items to fill the specified
-many rows. Note that if you do not have enough items to fill this
+number of rows, some rows will be of zero width.
-many rows some rows will be of zero width.
 */
 void QDeclarativeGrid::setColumns(const int columns)
 {
 if (columns == m_columns)
 /*!
 \qmlproperty enumeration Grid::flow
 This property holds the flow of the layout.
-Possible values are \c Grid.LeftToRight (default) and \c Grid.TopToBottom.
+Possible values are:
-If \a flow is \c Grid.LeftToRight, the items are positioned next to
+\list
-to each other from left to right, then wrapped to the next line.
+\o Grid.LeftToRight (default) - Items are positioned next to
-If \a flow is \c Grid.TopToBottom, the items are positioned next to each
+to each other from left to right, then wrapped to the next line.
-other from top to bottom, then wrapped to the next column.
+\o Grid.TopToBottom - Items are positioned next to each
+other from top to bottom, then wrapped to the next column.
+\endlist
 */
 QDeclarativeGrid::Flow QDeclarativeGrid::flow() const
 {
 return m_flow;
 }
 }
 /*!
 \qmlclass Flow QDeclarativeFlow
 \since 4.7
-\brief The Flow item lines up its children side by side, wrapping as necessary.
+\brief The Flow item arranges its children side by side, wrapping as necessary.
 \inherits Item
+The Flow item positions its child items so that they are side by side and are
+not overlapping.
 Note that the positioner assumes that the x and y positions of its children
 will not change. If you manually change the x or y properties in script, bind
 the x or y properties, use anchors on a child of a positioner, or have the
 width or height of a child depend on the position of a child, then the
-positioner may exhibit strange behaviour.
+positioner may exhibit strange behaviour.  If you need to perform any of these
+actions, consider positioning the items without the use of a Flow.
+Items with a width or height of 0 will not be positioned.
+\sa Grid, {declarative/positioners}{Positioners example}
 */
 /*!
 \qmlproperty Transition Flow::add
 This property holds the transition to apply when adding an item to the positioner.
 The transition will only be applied to the added item(s).
 Positioner transitions will only affect the position (x,y) of items.
-Added can mean that either the object has been created or reparented, and thus is now a child or the positioner, or that the object has had its opacity increased from zero, and thus is now visible.
+An object is considered to be added to the positioner if it has been
+created or reparented and thus is now a child or the positioner, or if the
+object has had its opacity increased from zero, and thus is now
+visible.
 */
 /*!
 \qmlproperty Transition Flow::move
 This property holds the transition to apply when moving an item within the positioner.
 Positioner transitions will only affect the position (x,y) of items.
 /*!
 \qmlproperty enumeration Flow::flow
 This property holds the flow of the layout.
-Possible values are \c Flow.LeftToRight (default) and \c Flow.TopToBottom.
+Possible values are:
-If \a flow is \c Flow.LeftToRight, the items are positioned next to
+\list
+\o Flow.LeftToRight (default) - Items are positioned next to
 to each other from left to right until the width of the Flow
 is exceeded, then wrapped to the next line.
-If \a flow is \c Flow.TopToBottom, the items are positioned next to each
+\o Flow.TopToBottom - Items are positioned next to each
 other from top to bottom until the height of the Flow is exceeded,
 then wrapped to the next column.
+\endlist
 */
 QDeclarativeFlow::Flow QDeclarativeFlow::flow() const
 {
 Q_D(const QDeclarativeFlow);
 return d->flow;
 const PositionedItem &child = positionedItems.at(i);
 if (!child.item || isInvisible(child.item))
 continue;
 if (d->flow == LeftToRight)  {
-if (hoffset && hoffset + child.item->width() > width()) {
+if (widthValid() && hoffset && hoffset + child.item->width() > width()) {
 hoffset = 0;
 voffset += linemax + spacing();
 linemax = 0;
 }
 } else {
-if (voffset && voffset + child.item->height() > height()) {
+if (heightValid() && voffset && voffset + child.item->height() > height()) {
 voffset = 0;
 hoffset += linemax + spacing();
 linemax = 0;
 }
 }

changeset 33	3e2da88830cd
parent 30	5dc02b23752f
child 37	758a864f9613