diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2020-02-11 15:33:56 +0100 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2020-02-25 15:43:16 +0100 |
| commit | aa9c6f983215b9a1e5eb0b6be1ed10f30a30f78a (patch) | |
| tree | 794262d755bd2033b1d763557ee269c30958da1d /src/gui/util | |
| parent | 26059d1b9b84bbaaa6c5a50a7dea88ffa9051c5a (diff) | |
Introduce QGraphicsLayoutItem::isEmpty()
This change does basically two things:
* Renames QGraphicsGridLayoutEngineItem::isIgnored() to
QGraphicsGridLayoutEngineItem::isEmpty() to be consistent with
QLayoutItem::isEmpty()
* Creates a new public API function QGraphicsLayoutItem::isEmpty() so
that there is a public method of overriding the behavior.
Change-Id: I771a8fb429f9764a75e220f0ff9d07f578f981d3
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qgridlayoutengine.cpp | 2 | ||||
| -rw-r--r-- | src/gui/util/qgridlayoutengine_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/util/qgridlayoutengine.cpp b/src/gui/util/qgridlayoutengine.cpp index 2b81d34848..f2d549b48f 100644 --- a/src/gui/util/qgridlayoutengine.cpp +++ b/src/gui/util/qgridlayoutengine.cpp @@ -1336,7 +1336,7 @@ void QGridLayoutEngine::fillRowData(QGridLayoutRowData *rowData, if (rowIsIdenticalToPrevious && item != itemAt(row - 1, column, orientation)) rowIsIdenticalToPrevious = false; - if (item && !item->isIgnored()) + if (item && !item->isEmpty()) rowIsEmpty = false; } diff --git a/src/gui/util/qgridlayoutengine_p.h b/src/gui/util/qgridlayoutengine_p.h index 181326103b..908aeda0c3 100644 --- a/src/gui/util/qgridlayoutengine_p.h +++ b/src/gui/util/qgridlayoutengine_p.h @@ -303,7 +303,7 @@ public: virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const = 0; virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const = 0; - virtual bool isIgnored() const { return false; } + virtual bool isEmpty() const { return false; } virtual void setGeometry(const QRectF &rect) = 0; /* |