Fix flowLayout
This commit is contained in:
parent
9ebd0da3f2
commit
ed8a481b84
|
@ -1,13 +1,22 @@
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
**
|
**
|
||||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
** Copyright (C) 2016 The Qt Company Ltd.
|
||||||
** All rights reserved.
|
** Contact: https://www.qt.io/licensing/
|
||||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
|
||||||
**
|
**
|
||||||
** This file is part of the examples of the Qt Toolkit.
|
** This file is part of the examples of the Qt Toolkit.
|
||||||
**
|
**
|
||||||
** $QT_BEGIN_LICENSE:BSD$
|
** $QT_BEGIN_LICENSE:BSD$
|
||||||
** You may use this file under the terms of the BSD license as follows:
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||||
|
** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** BSD License Usage
|
||||||
|
** Alternatively, you may use this file under the terms of the BSD license
|
||||||
|
** as follows:
|
||||||
**
|
**
|
||||||
** "Redistribution and use in source and binary forms, with or without
|
** "Redistribution and use in source and binary forms, with or without
|
||||||
** modification, are permitted provided that the following conditions are
|
** modification, are permitted provided that the following conditions are
|
||||||
|
@ -18,10 +27,10 @@
|
||||||
** notice, this list of conditions and the following disclaimer in
|
** notice, this list of conditions and the following disclaimer in
|
||||||
** the documentation and/or other materials provided with the
|
** the documentation and/or other materials provided with the
|
||||||
** distribution.
|
** distribution.
|
||||||
** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
|
** * Neither the name of The Qt Company Ltd nor the names of its
|
||||||
** the names of its contributors may be used to endorse or promote
|
** contributors may be used to endorse or promote products derived
|
||||||
** products derived from this software without specific prior written
|
** from this software without specific prior written permission.
|
||||||
** permission.
|
**
|
||||||
**
|
**
|
||||||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
@ -34,13 +43,16 @@
|
||||||
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||||
|
**
|
||||||
** $QT_END_LICENSE$
|
** $QT_END_LICENSE$
|
||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
|
||||||
#include <QtGui>
|
//#include <QtWidget>
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
#include "flowlayout.h"
|
#include "flowlayout.h"
|
||||||
|
//! [1]
|
||||||
FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing)
|
FlowLayout::FlowLayout(QWidget *parent, int margin, int hSpacing, int vSpacing)
|
||||||
: QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
|
: QLayout(parent), m_hSpace(hSpacing), m_vSpace(vSpacing)
|
||||||
{
|
{
|
||||||
|
@ -52,19 +64,31 @@
|
||||||
{
|
{
|
||||||
setContentsMargins(margin, margin, margin, margin);
|
setContentsMargins(margin, margin, margin, margin);
|
||||||
}
|
}
|
||||||
|
//! [1]
|
||||||
|
|
||||||
|
//! [2]
|
||||||
FlowLayout::~FlowLayout()
|
FlowLayout::~FlowLayout()
|
||||||
{
|
{
|
||||||
QLayoutItem *item;
|
QLayoutItem *item;
|
||||||
while ((item = takeAt(0)))
|
while ((item = takeAt(0)))
|
||||||
delete item;
|
delete item;
|
||||||
}
|
}
|
||||||
|
//! [2]
|
||||||
|
|
||||||
|
void FlowLayout::addWidgetAt(QWidget *w, int pos)
|
||||||
|
{
|
||||||
|
addWidget(w);
|
||||||
|
this->itemList.move(this->itemList.count()-1, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
//! [3]
|
||||||
void FlowLayout::addItem(QLayoutItem *item)
|
void FlowLayout::addItem(QLayoutItem *item)
|
||||||
{
|
{
|
||||||
itemList.append(item);
|
itemList.append(item);
|
||||||
}
|
}
|
||||||
|
//! [3]
|
||||||
|
|
||||||
|
//! [4]
|
||||||
int FlowLayout::horizontalSpacing() const
|
int FlowLayout::horizontalSpacing() const
|
||||||
{
|
{
|
||||||
if (m_hSpace >= 0) {
|
if (m_hSpace >= 0) {
|
||||||
|
@ -82,7 +106,9 @@
|
||||||
return smartSpacing(QStyle::PM_LayoutVerticalSpacing);
|
return smartSpacing(QStyle::PM_LayoutVerticalSpacing);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//! [4]
|
||||||
|
|
||||||
|
//! [5]
|
||||||
int FlowLayout::count() const
|
int FlowLayout::count() const
|
||||||
{
|
{
|
||||||
return itemList.size();
|
return itemList.size();
|
||||||
|
@ -97,15 +123,18 @@
|
||||||
{
|
{
|
||||||
if (index >= 0 && index < itemList.size())
|
if (index >= 0 && index < itemList.size())
|
||||||
return itemList.takeAt(index);
|
return itemList.takeAt(index);
|
||||||
else
|
return nullptr;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
//! [5]
|
||||||
|
|
||||||
|
//! [6]
|
||||||
Qt::Orientations FlowLayout::expandingDirections() const
|
Qt::Orientations FlowLayout::expandingDirections() const
|
||||||
{
|
{
|
||||||
return 0;
|
return { };
|
||||||
}
|
}
|
||||||
|
//! [6]
|
||||||
|
|
||||||
|
//! [7]
|
||||||
bool FlowLayout::hasHeightForWidth() const
|
bool FlowLayout::hasHeightForWidth() const
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
|
@ -116,7 +145,9 @@
|
||||||
int height = doLayout(QRect(0, 0, width, 0), true);
|
int height = doLayout(QRect(0, 0, width, 0), true);
|
||||||
return height;
|
return height;
|
||||||
}
|
}
|
||||||
|
//! [7]
|
||||||
|
|
||||||
|
//! [8]
|
||||||
void FlowLayout::setGeometry(const QRect &rect)
|
void FlowLayout::setGeometry(const QRect &rect)
|
||||||
{
|
{
|
||||||
QLayout::setGeometry(rect);
|
QLayout::setGeometry(rect);
|
||||||
|
@ -131,14 +162,16 @@
|
||||||
QSize FlowLayout::minimumSize() const
|
QSize FlowLayout::minimumSize() const
|
||||||
{
|
{
|
||||||
QSize size;
|
QSize size;
|
||||||
QLayoutItem *item;
|
for (const QLayoutItem *item : itemList)
|
||||||
foreach (item, itemList)
|
|
||||||
size = size.expandedTo(item->minimumSize());
|
size = size.expandedTo(item->minimumSize());
|
||||||
|
|
||||||
size += QSize(2*margin(), 2*margin());
|
const QMargins margins = contentsMargins();
|
||||||
|
size += QSize(margins.left() + margins.right(), margins.top() + margins.bottom());
|
||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
//! [8]
|
||||||
|
|
||||||
|
//! [9]
|
||||||
int FlowLayout::doLayout(const QRect &rect, bool testOnly) const
|
int FlowLayout::doLayout(const QRect &rect, bool testOnly) const
|
||||||
{
|
{
|
||||||
int left, top, right, bottom;
|
int left, top, right, bottom;
|
||||||
|
@ -147,10 +180,11 @@
|
||||||
int x = effectiveRect.x();
|
int x = effectiveRect.x();
|
||||||
int y = effectiveRect.y();
|
int y = effectiveRect.y();
|
||||||
int lineHeight = 0;
|
int lineHeight = 0;
|
||||||
|
//! [9]
|
||||||
|
|
||||||
QLayoutItem *item;
|
//! [10]
|
||||||
foreach (item, itemList) {
|
for (QLayoutItem *item : itemList) {
|
||||||
QWidget *wid = item->widget();
|
const QWidget *wid = item->widget();
|
||||||
int spaceX = horizontalSpacing();
|
int spaceX = horizontalSpacing();
|
||||||
if (spaceX == -1)
|
if (spaceX == -1)
|
||||||
spaceX = wid->style()->layoutSpacing(
|
spaceX = wid->style()->layoutSpacing(
|
||||||
|
@ -159,6 +193,8 @@
|
||||||
if (spaceY == -1)
|
if (spaceY == -1)
|
||||||
spaceY = wid->style()->layoutSpacing(
|
spaceY = wid->style()->layoutSpacing(
|
||||||
QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical);
|
QSizePolicy::PushButton, QSizePolicy::PushButton, Qt::Vertical);
|
||||||
|
//! [10]
|
||||||
|
//! [11]
|
||||||
int nextX = x + item->sizeHint().width() + spaceX;
|
int nextX = x + item->sizeHint().width() + spaceX;
|
||||||
if (nextX - spaceX > effectiveRect.right() && lineHeight > 0) {
|
if (nextX - spaceX > effectiveRect.right() && lineHeight > 0) {
|
||||||
x = effectiveRect.x();
|
x = effectiveRect.x();
|
||||||
|
@ -175,6 +211,8 @@
|
||||||
}
|
}
|
||||||
return y + lineHeight - rect.y() + bottom;
|
return y + lineHeight - rect.y() + bottom;
|
||||||
}
|
}
|
||||||
|
//! [11]
|
||||||
|
//! [12]
|
||||||
int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const
|
int FlowLayout::smartSpacing(QStyle::PixelMetric pm) const
|
||||||
{
|
{
|
||||||
QObject *parent = this->parent();
|
QObject *parent = this->parent();
|
||||||
|
@ -182,14 +220,9 @@
|
||||||
return -1;
|
return -1;
|
||||||
} else if (parent->isWidgetType()) {
|
} else if (parent->isWidgetType()) {
|
||||||
QWidget *pw = static_cast<QWidget *>(parent);
|
QWidget *pw = static_cast<QWidget *>(parent);
|
||||||
return pw->style()->pixelMetric(pm, 0, pw);
|
return pw->style()->pixelMetric(pm, nullptr, pw);
|
||||||
} else {
|
} else {
|
||||||
return static_cast<QLayout *>(parent)->spacing();
|
return static_cast<QLayout *>(parent)->spacing();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void FlowLayout::insertWidgetAt(QWidget *widget, int index)
|
//! [12]
|
||||||
{
|
|
||||||
addWidget(widget);
|
|
||||||
this->itemList.move(this->itemList.count()-1, 0);
|
|
||||||
//this->itemList.insert(index, new QWidgetItem(widget));
|
|
||||||
}
|
|
||||||
|
|
58
flowlayout.h
58
flowlayout.h
|
@ -1,13 +1,22 @@
|
||||||
/****************************************************************************
|
/****************************************************************************
|
||||||
**
|
**
|
||||||
** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
|
** Copyright (C) 2016 The Qt Company Ltd.
|
||||||
** All rights reserved.
|
** Contact: https://www.qt.io/licensing/
|
||||||
** Contact: Nokia Corporation (qt-info@nokia.com)
|
|
||||||
**
|
**
|
||||||
** This file is part of the examples of the Qt Toolkit.
|
** This file is part of the examples of the Qt Toolkit.
|
||||||
**
|
**
|
||||||
** $QT_BEGIN_LICENSE:BSD$
|
** $QT_BEGIN_LICENSE:BSD$
|
||||||
** You may use this file under the terms of the BSD license as follows:
|
** Commercial License Usage
|
||||||
|
** Licensees holding valid commercial Qt licenses may use this file in
|
||||||
|
** accordance with the commercial license agreement provided with the
|
||||||
|
** Software or, alternatively, in accordance with the terms contained in
|
||||||
|
** a written agreement between you and The Qt Company. For licensing terms
|
||||||
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
||||||
|
** information use the contact form at https://www.qt.io/contact-us.
|
||||||
|
**
|
||||||
|
** BSD License Usage
|
||||||
|
** Alternatively, you may use this file under the terms of the BSD license
|
||||||
|
** as follows:
|
||||||
**
|
**
|
||||||
** "Redistribution and use in source and binary forms, with or without
|
** "Redistribution and use in source and binary forms, with or without
|
||||||
** modification, are permitted provided that the following conditions are
|
** modification, are permitted provided that the following conditions are
|
||||||
|
@ -18,10 +27,10 @@
|
||||||
** notice, this list of conditions and the following disclaimer in
|
** notice, this list of conditions and the following disclaimer in
|
||||||
** the documentation and/or other materials provided with the
|
** the documentation and/or other materials provided with the
|
||||||
** distribution.
|
** distribution.
|
||||||
** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
|
** * Neither the name of The Qt Company Ltd nor the names of its
|
||||||
** the names of its contributors may be used to endorse or promote
|
** contributors may be used to endorse or promote products derived
|
||||||
** products derived from this software without specific prior written
|
** from this software without specific prior written permission.
|
||||||
** permission.
|
**
|
||||||
**
|
**
|
||||||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
@ -34,6 +43,7 @@
|
||||||
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
|
||||||
|
**
|
||||||
** $QT_END_LICENSE$
|
** $QT_END_LICENSE$
|
||||||
**
|
**
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
|
@ -43,27 +53,28 @@
|
||||||
|
|
||||||
#include <QLayout>
|
#include <QLayout>
|
||||||
#include <QRect>
|
#include <QRect>
|
||||||
#include <QWidgetItem>
|
#include <QStyle>
|
||||||
|
//! [0]
|
||||||
class FlowLayout : public QLayout
|
class FlowLayout : public QLayout
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1);
|
explicit FlowLayout(QWidget *parent, int margin = -1, int hSpacing = -1, int vSpacing = -1);
|
||||||
FlowLayout(int margin = -1, int hSpacing = -1, int vSpacing = -1);
|
explicit FlowLayout(int margin = -1, int hSpacing = -1, int vSpacing = -1);
|
||||||
~FlowLayout();
|
~FlowLayout();
|
||||||
|
|
||||||
void addItem(QLayoutItem *item);
|
void addWidgetAt(QWidget *w, int pos);
|
||||||
|
void addItem(QLayoutItem *item) override;
|
||||||
int horizontalSpacing() const;
|
int horizontalSpacing() const;
|
||||||
int verticalSpacing() const;
|
int verticalSpacing() const;
|
||||||
Qt::Orientations expandingDirections() const;
|
Qt::Orientations expandingDirections() const override;
|
||||||
bool hasHeightForWidth() const;
|
bool hasHeightForWidth() const override;
|
||||||
int heightForWidth(int) const;
|
int heightForWidth(int) const override;
|
||||||
int count() const;
|
int count() const override;
|
||||||
QLayoutItem *itemAt(int index) const;
|
QLayoutItem *itemAt(int index) const override;
|
||||||
QSize minimumSize() const;
|
QSize minimumSize() const override;
|
||||||
void setGeometry(const QRect &rect);
|
void setGeometry(const QRect &rect) override;
|
||||||
QSize sizeHint() const;
|
QSize sizeHint() const override;
|
||||||
QLayoutItem *takeAt(int index);
|
QLayoutItem *takeAt(int index) override;
|
||||||
void insertWidgetAt(QWidget *widget, int index);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int doLayout(const QRect &rect, bool testOnly) const;
|
int doLayout(const QRect &rect, bool testOnly) const;
|
||||||
|
@ -73,5 +84,6 @@
|
||||||
int m_hSpace;
|
int m_hSpace;
|
||||||
int m_vSpace;
|
int m_vSpace;
|
||||||
};
|
};
|
||||||
|
//! [0]
|
||||||
|
|
||||||
#endif
|
#endif // FLOWLAYOUT_H
|
||||||
|
|
|
@ -173,7 +173,7 @@ void MainWindow::searchFinished(KonaSearch *ks) {
|
||||||
KonaPreviewImageView *temp = new KonaPreviewImageView();
|
KonaPreviewImageView *temp = new KonaPreviewImageView();
|
||||||
temp->setObjectName(QString::number(ki->getId()));
|
temp->setObjectName(QString::number(ki->getId()));
|
||||||
if (insertAtBeginning) {
|
if (insertAtBeginning) {
|
||||||
flowLayout->insertWidgetAt(temp, 0); // Add @ beginning
|
flowLayout->addWidgetAt(temp, 0); // Add @ beginning
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
flowLayout->addWidget(temp); // Add @ end
|
flowLayout->addWidget(temp); // Add @ end
|
||||||
|
|
Loading…
Reference in New Issue