summaryrefslogtreecommitdiffstats
path: root/examples/graphicsview/flowlayout/flowlayout.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'examples/graphicsview/flowlayout/flowlayout.cpp')
-rw-r--r--examples/graphicsview/flowlayout/flowlayout.cpp49
1 files changed, 45 insertions, 4 deletions
diff --git a/examples/graphicsview/flowlayout/flowlayout.cpp b/examples/graphicsview/flowlayout/flowlayout.cpp
index d1676bc..d36c37f 100644
--- a/examples/graphicsview/flowlayout/flowlayout.cpp
+++ b/examples/graphicsview/flowlayout/flowlayout.cpp
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
#include "flowlayout.h"
#include <QtGui/qwidget.h>
#include <QtCore/qmath.h>
@@ -33,6 +74,7 @@ QGraphicsLayoutItem *FlowLayout::itemAt(int index) const
void FlowLayout::removeAt(int index)
{
m_items.removeAt(index);
+ invalidate();
}
qreal FlowLayout::spacing(Qt::Orientation o) const
@@ -54,7 +96,7 @@ void FlowLayout::setGeometry(const QRectF &geom)
doLayout(geom, true);
}
-qreal FlowLayout::doLayout(const QRectF &geom, bool applyNewGeometry)
+qreal FlowLayout::doLayout(const QRectF &geom, bool applyNewGeometry) const
{
QPointF tl = geom.topLeft();
qreal maxw = geom.width();
@@ -98,15 +140,14 @@ QSizeF FlowLayout::minSize(const QSizeF &constraint) const
qreal left, top, right, bottom;
getContentsMargins(&left, &top, &right, &bottom);
if (constraint.width() > 0) { // height for width
- FlowLayout *that = const_cast<FlowLayout *>(this);
- qreal height = that->doLayout(QRectF(QPointF(0,0), constraint), false);
+ qreal height = doLayout(QRectF(QPointF(0,0), constraint), false);
size = QSizeF(constraint.width(), height);
} else {
QGraphicsLayoutItem *item;
foreach (item, m_items)
size = size.expandedTo(item->effectiveSizeHint(Qt::MinimumSize));
size += QSize(left + right, top + bottom);
- }
+ }
return size;
}