aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/imports/controls/Button.qml2
-rw-r--r--src/imports/controls/material/Button.qml2
-rw-r--r--src/imports/controls/qtquickcontrols2plugin.cpp4
-rw-r--r--src/imports/controls/universal/Button.qml2
-rw-r--r--src/quickcontrols2/qquickiconlabel.cpp (renamed from src/quickcontrols2/qquickdisplaylayout.cpp)132
-rw-r--r--src/quickcontrols2/qquickiconlabel_p.h (renamed from src/quickcontrols2/qquickdisplaylayout_p.h)20
-rw-r--r--src/quickcontrols2/qquickiconlabel_p_p.h (renamed from src/quickcontrols2/qquickdisplaylayout_p_p.h)16
-rw-r--r--src/quickcontrols2/quickcontrols2.pri6
-rw-r--r--tests/auto/qquickiconlabel/data/iconlabel.qml (renamed from tests/auto/qquickdisplaylayout/data/layout.qml)2
-rw-r--r--tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml (renamed from tests/auto/qquickdisplaylayout/data/spacingWithOnlyIcon.qml)2
-rw-r--r--tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml (renamed from tests/auto/qquickdisplaylayout/data/spacingWithOnlyText.qml)2
-rw-r--r--tests/auto/qquickiconlabel/qquickiconlabel.pro (renamed from tests/auto/qquickdisplaylayout/qquickdisplaylayout.pro)4
-rw-r--r--tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp (renamed from tests/auto/qquickdisplaylayout/tst_qquickdisplaylayout.cpp)178
13 files changed, 186 insertions, 186 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 814448a2..d96c5c98 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -57,7 +57,7 @@ T.Button {
icon.height: 24
icon.color: enabled ? undefined : Default.textDisabledLightColor
- contentItem: DisplayLayout {
+ contentItem: IconLabel {
spacing: control.spacing
mirrored: control.mirrored
display: control.display
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 47a02e53..b1a30916 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -64,7 +64,7 @@ T.Button {
: control.down ? 8 : 2
Material.background: flat ? "transparent" : undefined
- contentItem: DisplayLayout {
+ contentItem: IconLabel {
spacing: control.spacing
mirrored: control.mirrored
display: control.display
diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp
index 084a24ba..bdace39a 100644
--- a/src/imports/controls/qtquickcontrols2plugin.cpp
+++ b/src/imports/controls/qtquickcontrols2plugin.cpp
@@ -39,7 +39,7 @@
#include <QtQuickControls2/private/qquickcolor_p.h>
#include <QtQuickControls2/private/qquickiconimage_p.h>
#include <QtQuickControls2/private/qquickplaceholdertext_p.h>
-#include <QtQuickControls2/private/qquickdisplaylayout_p.h>
+#include <QtQuickControls2/private/qquickiconlabel_p.h>
#include <QtQuickControls2/private/qquickstyle_p.h>
#include <QtQuickControls2/private/qquickstyleplugin_p.h>
#include <QtQuickControls2/private/qquickstyleselector_p.h>
@@ -194,7 +194,7 @@ void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *ur
qmlRegisterType<QQuickIconImage>(import, 2, 3, "IconImage");
qmlRegisterSingletonType<QQuickColor>(import, 2, 3, "Color", colorSingleton);
- qmlRegisterType<QQuickDisplayLayout>(import, 2, 3, "DisplayLayout");
+ qmlRegisterType<QQuickIconLabel>(import, 2, 3, "IconLabel");
}
QT_END_NAMESPACE
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml
index a5e03ea2..29b05f32 100644
--- a/src/imports/controls/universal/Button.qml
+++ b/src/imports/controls/universal/Button.qml
@@ -60,7 +60,7 @@ T.Button {
property bool useSystemFocusVisuals: true
- contentItem: DisplayLayout {
+ contentItem: IconLabel {
spacing: control.spacing
mirrored: control.mirrored
display: control.display
diff --git a/src/quickcontrols2/qquickdisplaylayout.cpp b/src/quickcontrols2/qquickiconlabel.cpp
index 5ce21d4d..0c31f6c6 100644
--- a/src/quickcontrols2/qquickdisplaylayout.cpp
+++ b/src/quickcontrols2/qquickiconlabel.cpp
@@ -34,17 +34,17 @@
**
****************************************************************************/
-#include "qquickdisplaylayout_p.h"
-#include "qquickdisplaylayout_p_p.h"
+#include "qquickiconlabel_p.h"
+#include "qquickiconlabel_p_p.h"
#include <QtQuick/private/qquickitem_p.h>
QT_BEGIN_NAMESPACE
-QQuickDisplayLayoutPrivate::QQuickDisplayLayoutPrivate()
+QQuickIconLabelPrivate::QQuickIconLabelPrivate()
: icon(nullptr),
text(nullptr),
- display(QQuickDisplayLayout::TextBesideIcon),
+ display(QQuickIconLabel::TextBesideIcon),
spacing(0),
mirrored(false),
topPadding(0),
@@ -54,14 +54,14 @@ QQuickDisplayLayoutPrivate::QQuickDisplayLayoutPrivate()
{
}
-void QQuickDisplayLayoutPrivate::updateImplicitSize()
+void QQuickIconLabelPrivate::updateImplicitSize()
{
- Q_Q(QQuickDisplayLayout);
+ Q_Q(QQuickIconLabel);
if (!q->isComponentComplete())
return;
- const bool showIcon = icon && display != QQuickDisplayLayout::TextOnly;
- const bool showText = text && display != QQuickDisplayLayout::IconOnly;
+ const bool showIcon = icon && display != QQuickIconLabel::TextOnly;
+ const bool showText = text && display != QQuickIconLabel::IconOnly;
const qreal horizontalPadding = leftPadding + rightPadding;
const qreal verticalPadding = topPadding + bottomPadding;
const qreal iconImplicitWidth = showIcon ? icon->implicitWidth() : 0;
@@ -74,9 +74,9 @@ void QQuickDisplayLayoutPrivate::updateImplicitSize()
q->setImplicitSize(implicitWidth, implicitHeight);
}
-void QQuickDisplayLayoutPrivate::layout()
+void QQuickIconLabelPrivate::layout()
{
- Q_Q(QQuickDisplayLayout);
+ Q_Q(QQuickIconLabel);
if (!q->isComponentComplete())
return;
@@ -90,7 +90,7 @@ void QQuickDisplayLayoutPrivate::layout()
const qreal verticalCenter = h / 2;
switch (display) {
- case QQuickDisplayLayout::IconOnly:
+ case QQuickIconLabel::IconOnly:
if (icon) {
icon->setWidth(qMin(icon->implicitWidth(), availableWidth));
icon->setHeight(qMin(icon->implicitHeight(), availableHeight));
@@ -101,7 +101,7 @@ void QQuickDisplayLayoutPrivate::layout()
if (text)
text->setVisible(false);
break;
- case QQuickDisplayLayout::TextOnly:
+ case QQuickIconLabel::TextOnly:
if (text) {
text->setWidth(qMin(text->implicitWidth(), availableWidth));
text->setHeight(qMin(text->implicitHeight(), availableHeight));
@@ -112,7 +112,7 @@ void QQuickDisplayLayoutPrivate::layout()
if (icon)
icon->setVisible(false);
break;
- case QQuickDisplayLayout::TextBesideIcon:
+ case QQuickIconLabel::TextBesideIcon:
default:
// Work out the sizes first, as the positions depend on them.
qreal iconWidth = 0;
@@ -152,31 +152,31 @@ static const QQuickItemPrivate::ChangeTypes itemChangeTypes =
| QQuickItemPrivate::ImplicitHeight
| QQuickItemPrivate::Destroyed;
-void QQuickDisplayLayoutPrivate::watchChanges(QQuickItem *item)
+void QQuickIconLabelPrivate::watchChanges(QQuickItem *item)
{
QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
itemPrivate->addItemChangeListener(this, itemChangeTypes);
}
-void QQuickDisplayLayoutPrivate::unwatchChanges(QQuickItem* item)
+void QQuickIconLabelPrivate::unwatchChanges(QQuickItem* item)
{
QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(item);
itemPrivate->removeItemChangeListener(this, itemChangeTypes);
}
-void QQuickDisplayLayoutPrivate::itemImplicitWidthChanged(QQuickItem *)
+void QQuickIconLabelPrivate::itemImplicitWidthChanged(QQuickItem *)
{
updateImplicitSize();
layout();
}
-void QQuickDisplayLayoutPrivate::itemImplicitHeightChanged(QQuickItem *)
+void QQuickIconLabelPrivate::itemImplicitHeightChanged(QQuickItem *)
{
updateImplicitSize();
layout();
}
-void QQuickDisplayLayoutPrivate::itemDestroyed(QQuickItem *item)
+void QQuickIconLabelPrivate::itemDestroyed(QQuickItem *item)
{
unwatchChanges(item);
if (item == icon)
@@ -185,29 +185,29 @@ void QQuickDisplayLayoutPrivate::itemDestroyed(QQuickItem *item)
text = nullptr;
}
-QQuickDisplayLayout::QQuickDisplayLayout(QQuickItem *parent)
- : QQuickItem(*(new QQuickDisplayLayoutPrivate), parent)
+QQuickIconLabel::QQuickIconLabel(QQuickItem *parent)
+ : QQuickItem(*(new QQuickIconLabelPrivate), parent)
{
}
-QQuickDisplayLayout::~QQuickDisplayLayout()
+QQuickIconLabel::~QQuickIconLabel()
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (d->icon)
d->unwatchChanges(d->icon);
if (d->text)
d->unwatchChanges(d->text);
}
-QQuickItem *QQuickDisplayLayout::icon() const
+QQuickItem *QQuickIconLabel::icon() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->icon;
}
-void QQuickDisplayLayout::setIcon(QQuickItem *icon)
+void QQuickIconLabel::setIcon(QQuickItem *icon)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (d->icon == icon)
return;
@@ -226,15 +226,15 @@ void QQuickDisplayLayout::setIcon(QQuickItem *icon)
emit iconChanged();
}
-QQuickItem *QQuickDisplayLayout::text() const
+QQuickItem *QQuickIconLabel::text() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->text;
}
-void QQuickDisplayLayout::setText(QQuickItem *text)
+void QQuickIconLabel::setText(QQuickItem *text)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (d->text == text)
return;
@@ -253,15 +253,15 @@ void QQuickDisplayLayout::setText(QQuickItem *text)
emit textChanged();
}
-QQuickDisplayLayout::Display QQuickDisplayLayout::display() const
+QQuickIconLabel::Display QQuickIconLabel::display() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->display;
}
-void QQuickDisplayLayout::setDisplay(Display display)
+void QQuickIconLabel::setDisplay(Display display)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (d->display == display)
return;
@@ -271,15 +271,15 @@ void QQuickDisplayLayout::setDisplay(Display display)
emit displayChanged();
}
-qreal QQuickDisplayLayout::spacing() const
+qreal QQuickIconLabel::spacing() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->spacing;
}
-void QQuickDisplayLayout::setSpacing(qreal spacing)
+void QQuickIconLabel::setSpacing(qreal spacing)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (qFuzzyCompare(d->spacing, spacing))
return;
@@ -289,15 +289,15 @@ void QQuickDisplayLayout::setSpacing(qreal spacing)
emit spacingChanged();
}
-bool QQuickDisplayLayout::isMirrored() const
+bool QQuickIconLabel::isMirrored() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->mirrored;
}
-void QQuickDisplayLayout::setMirrored(bool mirrored)
+void QQuickIconLabel::setMirrored(bool mirrored)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (d->mirrored == mirrored)
return;
@@ -307,15 +307,15 @@ void QQuickDisplayLayout::setMirrored(bool mirrored)
emit mirroredChanged();
}
-qreal QQuickDisplayLayout::topPadding() const
+qreal QQuickIconLabel::topPadding() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->topPadding;
}
-void QQuickDisplayLayout::setTopPadding(qreal padding)
+void QQuickIconLabel::setTopPadding(qreal padding)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (qFuzzyCompare(d->topPadding, padding))
return;
@@ -325,20 +325,20 @@ void QQuickDisplayLayout::setTopPadding(qreal padding)
emit topPaddingChanged();
}
-void QQuickDisplayLayout::resetTopPadding()
+void QQuickIconLabel::resetTopPadding()
{
setTopPadding(0);
}
-qreal QQuickDisplayLayout::leftPadding() const
+qreal QQuickIconLabel::leftPadding() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->leftPadding;
}
-void QQuickDisplayLayout::setLeftPadding(qreal padding)
+void QQuickIconLabel::setLeftPadding(qreal padding)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (qFuzzyCompare(d->leftPadding, padding))
return;
@@ -348,20 +348,20 @@ void QQuickDisplayLayout::setLeftPadding(qreal padding)
emit leftPaddingChanged();
}
-void QQuickDisplayLayout::resetLeftPadding()
+void QQuickIconLabel::resetLeftPadding()
{
setLeftPadding(0);
}
-qreal QQuickDisplayLayout::rightPadding() const
+qreal QQuickIconLabel::rightPadding() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->rightPadding;
}
-void QQuickDisplayLayout::setRightPadding(qreal padding)
+void QQuickIconLabel::setRightPadding(qreal padding)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (qFuzzyCompare(d->rightPadding, padding))
return;
@@ -371,20 +371,20 @@ void QQuickDisplayLayout::setRightPadding(qreal padding)
emit rightPaddingChanged();
}
-void QQuickDisplayLayout::resetRightPadding()
+void QQuickIconLabel::resetRightPadding()
{
setRightPadding(0);
}
-qreal QQuickDisplayLayout::bottomPadding() const
+qreal QQuickIconLabel::bottomPadding() const
{
- Q_D(const QQuickDisplayLayout);
+ Q_D(const QQuickIconLabel);
return d->bottomPadding;
}
-void QQuickDisplayLayout::setBottomPadding(qreal padding)
+void QQuickIconLabel::setBottomPadding(qreal padding)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
if (qFuzzyCompare(d->bottomPadding, padding))
return;
@@ -394,22 +394,22 @@ void QQuickDisplayLayout::setBottomPadding(qreal padding)
emit bottomPaddingChanged();
}
-void QQuickDisplayLayout::resetBottomPadding()
+void QQuickIconLabel::resetBottomPadding()
{
setBottomPadding(0);
}
-void QQuickDisplayLayout::componentComplete()
+void QQuickIconLabel::componentComplete()
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
QQuickItem::componentComplete();
d->updateImplicitSize();
d->layout();
}
-void QQuickDisplayLayout::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+void QQuickIconLabel::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
{
- Q_D(QQuickDisplayLayout);
+ Q_D(QQuickIconLabel);
QQuickItem::geometryChanged(newGeometry, oldGeometry);
d->layout();
}
diff --git a/src/quickcontrols2/qquickdisplaylayout_p.h b/src/quickcontrols2/qquickiconlabel_p.h
index dde0aaf8..56a02ab1 100644
--- a/src/quickcontrols2/qquickdisplaylayout_p.h
+++ b/src/quickcontrols2/qquickiconlabel_p.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QQUICKDISPLAYLAYOUT_P_H
-#define QQUICKDISPLAYLAYOUT_P_H
+#ifndef QQUICKICONLABEL_P_H
+#define QQUICKICONLABEL_P_H
//
// W A R N I N G
@@ -53,9 +53,9 @@
QT_BEGIN_NAMESPACE
-class QQuickDisplayLayoutPrivate;
+class QQuickIconLabelPrivate;
-class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickDisplayLayout : public QQuickItem
+class Q_QUICKCONTROLS2_PRIVATE_EXPORT QQuickIconLabel : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QQuickItem *icon READ icon WRITE setIcon NOTIFY iconChanged FINAL)
@@ -77,8 +77,8 @@ public:
};
Q_ENUM(Display)
- explicit QQuickDisplayLayout(QQuickItem *parent = nullptr);
- ~QQuickDisplayLayout();
+ explicit QQuickIconLabel(QQuickItem *parent = nullptr);
+ ~QQuickIconLabel();
QQuickItem *icon() const;
void setIcon(QQuickItem *icon);
@@ -127,12 +127,12 @@ protected:
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
private:
- Q_DISABLE_COPY(QQuickDisplayLayout)
- Q_DECLARE_PRIVATE(QQuickDisplayLayout)
+ Q_DISABLE_COPY(QQuickIconLabel)
+ Q_DECLARE_PRIVATE(QQuickIconLabel)
};
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QQuickDisplayLayout)
+QML_DECLARE_TYPE(QQuickIconLabel)
-#endif // QQUICKDISPLAYLAYOUT_P_H
+#endif // QQUICKICONLABEL_P_H
diff --git a/src/quickcontrols2/qquickdisplaylayout_p_p.h b/src/quickcontrols2/qquickiconlabel_p_p.h
index 1397b93a..41022453 100644
--- a/src/quickcontrols2/qquickdisplaylayout_p_p.h
+++ b/src/quickcontrols2/qquickiconlabel_p_p.h
@@ -34,8 +34,8 @@
**
****************************************************************************/
-#ifndef QQUICKDISPLAYLAYOUT_P_P_H
-#define QQUICKDISPLAYLAYOUT_P_P_H
+#ifndef QQUICKICONLABEL_P_P_H
+#define QQUICKICONLABEL_P_P_H
//
// W A R N I N G
@@ -50,16 +50,16 @@
#include <QtQuick/private/qquickitem_p.h>
#include <QtQuickControls2/private/qtquickcontrols2global_p.h>
-#include <QtQuickControls2/private/qquickdisplaylayout_p.h>
+#include <QtQuickControls2/private/qquickiconlabel_p.h>
QT_BEGIN_NAMESPACE
-class QQuickDisplayLayoutPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
+class QQuickIconLabelPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
{
- Q_DECLARE_PUBLIC(QQuickDisplayLayout)
+ Q_DECLARE_PUBLIC(QQuickIconLabel)
public:
- explicit QQuickDisplayLayoutPrivate();
+ explicit QQuickIconLabelPrivate();
void updateImplicitSize();
void layout();
@@ -76,7 +76,7 @@ public:
QQuickItem *icon;
QQuickItem *text;
- QQuickDisplayLayout::Display display;
+ QQuickIconLabel::Display display;
qreal spacing;
bool mirrored;
qreal topPadding;
@@ -87,4 +87,4 @@ public:
QT_END_NAMESPACE
-#endif // QQUICKDISPLAYLAYOUT_P_P_H
+#endif // QQUICKICONLABEL_P_P_H
diff --git a/src/quickcontrols2/quickcontrols2.pri b/src/quickcontrols2/quickcontrols2.pri
index 5c93f14d..69e04ca1 100644
--- a/src/quickcontrols2/quickcontrols2.pri
+++ b/src/quickcontrols2/quickcontrols2.pri
@@ -3,10 +3,10 @@ HEADERS += \
$$PWD/qquickattachedobject_p.h \
$$PWD/qquickcolor_p.h \
$$PWD/qquickcolorimageprovider_p.h \
- $$PWD/qquickdisplaylayout_p.h \
- $$PWD/qquickdisplaylayout_p_p.h \
$$PWD/qquickiconimage_p.h \
$$PWD/qquickiconimage_p_p.h \
+ $$PWD/qquickiconlabel_p.h \
+ $$PWD/qquickiconlabel_p_p.h \
$$PWD/qquickplaceholdertext_p.h \
$$PWD/qquickproxytheme_p.h \
$$PWD/qquickstyle.h \
@@ -21,8 +21,8 @@ SOURCES += \
$$PWD/qquickattachedobject.cpp \
$$PWD/qquickcolor.cpp \
$$PWD/qquickcolorimageprovider.cpp \
- $$PWD/qquickdisplaylayout.cpp \
$$PWD/qquickiconimage.cpp \
+ $$PWD/qquickiconlabel.cpp \
$$PWD/qquickplaceholdertext.cpp \
$$PWD/qquickproxytheme.cpp \
$$PWD/qquickstyle.cpp \
diff --git a/tests/auto/qquickdisplaylayout/data/layout.qml b/tests/auto/qquickiconlabel/data/iconlabel.qml
index 4bfadf8e..9ce37b5c 100644
--- a/tests/auto/qquickdisplaylayout/data/layout.qml
+++ b/tests/auto/qquickiconlabel/data/iconlabel.qml
@@ -56,7 +56,7 @@ Item {
width: 200
height: 200
- DisplayLayout {
+ IconLabel {
icon: Image {
source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/check.png"
}
diff --git a/tests/auto/qquickdisplaylayout/data/spacingWithOnlyIcon.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
index 97f6706d..ee1c9b73 100644
--- a/tests/auto/qquickdisplaylayout/data/spacingWithOnlyIcon.qml
+++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyIcon.qml
@@ -56,7 +56,7 @@ Item {
width: 200
height: 200
- DisplayLayout {
+ IconLabel {
spacing: 10
mirrored: true
diff --git a/tests/auto/qquickdisplaylayout/data/spacingWithOnlyText.qml b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml
index 8f85d7b9..14c59001 100644
--- a/tests/auto/qquickdisplaylayout/data/spacingWithOnlyText.qml
+++ b/tests/auto/qquickiconlabel/data/spacingWithOnlyText.qml
@@ -56,7 +56,7 @@ Item {
width: 200
height: 200
- DisplayLayout {
+ IconLabel {
spacing: 10
text: Text {
diff --git a/tests/auto/qquickdisplaylayout/qquickdisplaylayout.pro b/tests/auto/qquickiconlabel/qquickiconlabel.pro
index 6b2a1ae4..6b0f73b3 100644
--- a/tests/auto/qquickdisplaylayout/qquickdisplaylayout.pro
+++ b/tests/auto/qquickiconlabel/qquickiconlabel.pro
@@ -1,13 +1,13 @@
CONFIG += testcase
macos:CONFIG -= app_bundle
-TARGET = tst_qquickdisplaylayout
+TARGET = tst_qquickiconlabel
QT += core gui qml quick testlib
QT_PRIVATE += quick-private quickcontrols2-private
include (../shared/util.pri)
-SOURCES += tst_qquickdisplaylayout.cpp
+SOURCES += tst_qquickiconlabel.cpp
TESTDATA += \
$$PWD/data/*.qml
diff --git a/tests/auto/qquickdisplaylayout/tst_qquickdisplaylayout.cpp b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
index dc13f2f0..0c417fc8 100644
--- a/tests/auto/qquickdisplaylayout/tst_qquickdisplaylayout.cpp
+++ b/tests/auto/qquickiconlabel/tst_qquickiconlabel.cpp
@@ -34,18 +34,18 @@
#include <QtQuick/qquickitem.h>
#include <QtQuick/qquickview.h>
-#include <QtQuickControls2/private/qquickdisplaylayout_p.h>
+#include <QtQuickControls2/private/qquickiconlabel_p.h>
#include "../shared/util.h"
#include "../shared/visualtestutil.h"
using namespace QQuickVisualTestUtil;
-class tst_qquickdisplaylayout : public QQmlDataTest
+class tst_qquickiconlabel : public QQmlDataTest
{
Q_OBJECT
public:
- tst_qquickdisplaylayout();
+ tst_qquickiconlabel();
private slots:
void display_data();
@@ -55,22 +55,22 @@ private slots:
void emptyIconSource();
};
-tst_qquickdisplaylayout::tst_qquickdisplaylayout()
+tst_qquickiconlabel::tst_qquickiconlabel()
{
}
-void tst_qquickdisplaylayout::display_data()
+void tst_qquickiconlabel::display_data()
{
- QTest::addColumn<QVector<QQuickDisplayLayout::Display> >("displayTypes");
+ QTest::addColumn<QVector<QQuickIconLabel::Display> >("displayTypes");
QTest::addColumn<bool>("mirrored");
- QTest::addColumn<qreal>("layoutWidth");
- QTest::addColumn<qreal>("layoutHeight");
+ QTest::addColumn<qreal>("labelWidth");
+ QTest::addColumn<qreal>("labelHeight");
QTest::addColumn<qreal>("spacing");
- typedef QVector<QQuickDisplayLayout::Display> DisplayVector;
- QQuickDisplayLayout::Display IconOnly = QQuickDisplayLayout::IconOnly;
- QQuickDisplayLayout::Display TextOnly = QQuickDisplayLayout::TextOnly;
- QQuickDisplayLayout::Display TextBesideIcon = QQuickDisplayLayout::TextBesideIcon;
+ typedef QVector<QQuickIconLabel::Display> DisplayVector;
+ QQuickIconLabel::Display IconOnly = QQuickIconLabel::IconOnly;
+ QQuickIconLabel::Display TextOnly = QQuickIconLabel::TextOnly;
+ QQuickIconLabel::Display TextBesideIcon = QQuickIconLabel::TextBesideIcon;
QTest::addRow("IconOnly") << (DisplayVector() << IconOnly) << false << -1.0 << -1.0 << 0.0;
QTest::addRow("TextOnly") << (DisplayVector() << TextOnly) << false << -1.0 << -1.0 << 0.0;
@@ -80,26 +80,26 @@ void tst_qquickdisplaylayout::display_data()
QTest::addRow("TextBesideIcon, spacing=10") << (DisplayVector() << TextBesideIcon) << false << -1.0 << -1.0 << 0.0;
QTest::addRow("TextBesideIcon => IconOnly => TextBesideIcon")
<< (DisplayVector() << TextBesideIcon << IconOnly << TextBesideIcon) << false << -1.0 << -1.0 << 0.0;
- QTest::addRow("TextBesideIcon => IconOnly => TextBesideIcon, layoutWidth=400")
+ QTest::addRow("TextBesideIcon => IconOnly => TextBesideIcon, labelWidth=400")
<< (DisplayVector() << TextBesideIcon << IconOnly << TextBesideIcon) << false << 400.0 << -1.0 << 0.0;
QTest::addRow("TextBesideIcon => TextOnly => TextBesideIcon")
<< (DisplayVector() << TextBesideIcon << TextOnly << TextBesideIcon) << false << -1.0 << -1.0 << 0.0;
- QTest::addRow("TextBesideIcon => TextOnly => TextBesideIcon, layoutWidth=400")
+ QTest::addRow("TextBesideIcon => TextOnly => TextBesideIcon, labelWidth=400")
<< (DisplayVector() << TextBesideIcon << TextOnly << TextBesideIcon) << false << 400.0 << -1.0 << 0.0;
QTest::addRow("IconOnly, mirrored") << (DisplayVector() << IconOnly) << true << -1.0 << -1.0 << 0.0;
QTest::addRow("TextOnly, mirrored") << (DisplayVector() << TextOnly) << true << -1.0 << -1.0 << 0.0;
QTest::addRow("TextBesideIcon, mirrored") << (DisplayVector() << TextBesideIcon) << true << -1.0 << -1.0 << 0.0;
}
-void tst_qquickdisplaylayout::display()
+void tst_qquickiconlabel::display()
{
- QFETCH(QVector<QQuickDisplayLayout::Display>, displayTypes);
+ QFETCH(QVector<QQuickIconLabel::Display>, displayTypes);
QFETCH(bool, mirrored);
- QFETCH(qreal, layoutWidth);
- QFETCH(qreal, layoutHeight);
+ QFETCH(qreal, labelWidth);
+ QFETCH(qreal, labelHeight);
QFETCH(qreal, spacing);
- QQuickView view(testFileUrl("layout.qml"));
+ QQuickView view(testFileUrl("iconlabel.qml"));
QCOMPARE(view.status(), QQuickView::Ready);
view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view));
@@ -107,99 +107,99 @@ void tst_qquickdisplaylayout::display()
QQuickItem *rootItem = view.rootObject();
QVERIFY(rootItem);
- QQuickDisplayLayout *layout = qobject_cast<QQuickDisplayLayout*>(rootItem->childItems().first());
- QVERIFY(layout);
- QCOMPARE(layout->spacing(), 0.0);
- QCOMPARE(layout->display(), QQuickDisplayLayout::TextBesideIcon);
- QCOMPARE(layout->isMirrored(), false);
+ QQuickIconLabel *label = qobject_cast<QQuickIconLabel*>(rootItem->childItems().first());
+ QVERIFY(label);
+ QCOMPARE(label->spacing(), 0.0);
+ QCOMPARE(label->display(), QQuickIconLabel::TextBesideIcon);
+ QCOMPARE(label->isMirrored(), false);
- // Setting layoutWidth allows us to test the issue where the icon's
+ // Setting labelWidth allows us to test the issue where the icon's
// width was not updated after switching between different display types.
- if (!qFuzzyCompare(layoutWidth, -1)) {
- layout->setWidth(layoutWidth);
- QCOMPARE(layout->width(), layoutWidth);
+ if (!qFuzzyCompare(labelWidth, -1)) {
+ label->setWidth(labelWidth);
+ QCOMPARE(label->width(), labelWidth);
}
- if (!qFuzzyCompare(layoutHeight, -1)) {
- layout->setHeight(layoutHeight);
- QCOMPARE(layout->height(), layoutHeight);
+ if (!qFuzzyCompare(labelHeight, -1)) {
+ label->setHeight(labelHeight);
+ QCOMPARE(label->height(), labelHeight);
}
- QQuickItem *icon = layout->icon();
+ QQuickItem *icon = label->icon();
QVERIFY(icon);
- QQuickItem *text = layout->text();
+ QQuickItem *text = label->text();
QVERIFY(text);
- QSignalSpy mirroredSpy(layout, SIGNAL(mirroredChanged()));
- bool expectChange = layout->isMirrored() != mirrored;
- layout->setMirrored(mirrored);
- QCOMPARE(layout->isMirrored(), mirrored);
+ QSignalSpy mirroredSpy(label, SIGNAL(mirroredChanged()));
+ bool expectChange = label->isMirrored() != mirrored;
+ label->setMirrored(mirrored);
+ QCOMPARE(label->isMirrored(), mirrored);
QCOMPARE(mirroredSpy.count(), expectChange ? 1 : 0);
- QSignalSpy spacingSpy(layout, SIGNAL(spacingChanged()));
- expectChange = !qFuzzyCompare(layout->spacing(), spacing);
- layout->setSpacing(spacing);
- QCOMPARE(layout->spacing(), spacing);
+ QSignalSpy spacingSpy(label, SIGNAL(spacingChanged()));
+ expectChange = !qFuzzyCompare(label->spacing(), spacing);
+ label->setSpacing(spacing);
+ QCOMPARE(label->spacing(), spacing);
QCOMPARE(spacingSpy.count(), expectChange ? 1 : 0);
- const qreal horizontalPadding = layout->leftPadding() + layout->rightPadding();
- const qreal verticalPadding = layout->topPadding() + layout->bottomPadding();
+ const qreal horizontalPadding = label->leftPadding() + label->rightPadding();
+ const qreal verticalPadding = label->topPadding() + label->bottomPadding();
// Test that the icon and text are correctly positioned and sized after
// setting several different display types in succession.
- for (QQuickDisplayLayout::Display displayType : qAsConst(displayTypes)) {
- QSignalSpy displaySpy(layout, SIGNAL(displayChanged()));
- const bool expectChange = layout->display() != displayType;
- layout->setDisplay(displayType);
- QCOMPARE(layout->display(), displayType);
+ for (QQuickIconLabel::Display displayType : qAsConst(displayTypes)) {
+ QSignalSpy displaySpy(label, SIGNAL(displayChanged()));
+ const bool expectChange = label->display() != displayType;
+ label->setDisplay(displayType);
+ QCOMPARE(label->display(), displayType);
QCOMPARE(displaySpy.count(), expectChange ? 1 : 0);
- const qreal horizontalCenter = layout->width() / 2;
- const qreal verticalCenter = layout->height() / 2;
+ const qreal horizontalCenter = label->width() / 2;
+ const qreal verticalCenter = label->height() / 2;
switch (displayType) {
- case QQuickDisplayLayout::IconOnly:
+ case QQuickIconLabel::IconOnly:
QCOMPARE(icon->x(), horizontalCenter - icon->width() / 2);
QCOMPARE(icon->y(), verticalCenter - icon->height() / 2);
QCOMPARE(icon->width(), icon->implicitWidth());
QCOMPARE(icon->height(), icon->implicitHeight());
QCOMPARE(icon->isVisible(), true);
QCOMPARE(text->isVisible(), false);
- QCOMPARE(layout->implicitWidth(), icon->implicitWidth() + horizontalPadding);
- QCOMPARE(layout->implicitHeight(), icon->implicitHeight() + verticalPadding);
+ QCOMPARE(label->implicitWidth(), icon->implicitWidth() + horizontalPadding);
+ QCOMPARE(label->implicitHeight(), icon->implicitHeight() + verticalPadding);
break;
- case QQuickDisplayLayout::TextOnly:
+ case QQuickIconLabel::TextOnly:
QCOMPARE(icon->isVisible(), false);
QCOMPARE(text->x(), horizontalCenter - text->width() / 2);
QCOMPARE(text->y(), verticalCenter - text->height() / 2);
QCOMPARE(text->width(), text->implicitWidth());
QCOMPARE(text->height(), text->implicitHeight());
QCOMPARE(text->isVisible(), true);
- QCOMPARE(layout->implicitWidth(), text->implicitWidth() + horizontalPadding);
- QCOMPARE(layout->implicitHeight(), text->implicitHeight() + verticalPadding);
+ QCOMPARE(label->implicitWidth(), text->implicitWidth() + horizontalPadding);
+ QCOMPARE(label->implicitHeight(), text->implicitHeight() + verticalPadding);
break;
- case QQuickDisplayLayout::TextBesideIcon:
+ case QQuickIconLabel::TextBesideIcon:
default:
- const qreal combinedWidth = icon->width() + layout->spacing() + text->width();
+ const qreal combinedWidth = icon->width() + label->spacing() + text->width();
const qreal contentX = horizontalCenter - combinedWidth / 2;
- QCOMPARE(icon->x(), contentX + (layout->isMirrored() ? text->width() + layout->spacing() : 0));
+ QCOMPARE(icon->x(), contentX + (label->isMirrored() ? text->width() + label->spacing() : 0));
QCOMPARE(icon->y(), verticalCenter - icon->height() / 2);
QCOMPARE(icon->width(), icon->implicitWidth());
QCOMPARE(icon->height(), icon->implicitHeight());
QCOMPARE(icon->isVisible(), true);
- QCOMPARE(text->x(), contentX + (layout->isMirrored() ? 0 : icon->width() + layout->spacing()));
+ QCOMPARE(text->x(), contentX + (label->isMirrored() ? 0 : icon->width() + label->spacing()));
QCOMPARE(text->y(), verticalCenter - text->height() / 2);
QCOMPARE(text->width(), text->implicitWidth());
QCOMPARE(text->height(), text->implicitHeight());
QCOMPARE(text->isVisible(), true);
- QCOMPARE(layout->implicitWidth(), combinedWidth + horizontalPadding);
- QCOMPARE(layout->implicitHeight(), qMax(icon->implicitHeight(), text->implicitHeight()) + verticalPadding);
+ QCOMPARE(label->implicitWidth(), combinedWidth + horizontalPadding);
+ QCOMPARE(label->implicitHeight(), qMax(icon->implicitHeight(), text->implicitHeight()) + verticalPadding);
break;
}
}
}
-void tst_qquickdisplaylayout::spacingWithOneDelegate_data()
+void tst_qquickiconlabel::spacingWithOneDelegate_data()
{
QTest::addColumn<QString>("qmlFileName");
@@ -207,7 +207,7 @@ void tst_qquickdisplaylayout::spacingWithOneDelegate_data()
QTest::addRow("spacingWithOnlyText") << QStringLiteral("spacingWithOnlyText.qml");
}
-void tst_qquickdisplaylayout::spacingWithOneDelegate()
+void tst_qquickiconlabel::spacingWithOneDelegate()
{
QFETCH(QString, qmlFileName);
@@ -219,25 +219,25 @@ void tst_qquickdisplaylayout::spacingWithOneDelegate()
QQuickItem *rootItem = view.rootObject();
QVERIFY(rootItem);
- QQuickDisplayLayout *layout = qobject_cast<QQuickDisplayLayout*>(rootItem->childItems().first());
- QVERIFY(layout);
+ QQuickIconLabel *label = qobject_cast<QQuickIconLabel*>(rootItem->childItems().first());
+ QVERIFY(label);
QQuickItem *delegate = nullptr;
- if (layout->icon()) {
- QVERIFY(!layout->text());
- delegate = layout->icon();
+ if (label->icon()) {
+ QVERIFY(!label->text());
+ delegate = label->icon();
} else {
- QVERIFY(!layout->icon());
- delegate = layout->text();
+ QVERIFY(!label->icon());
+ delegate = label->text();
}
QVERIFY(delegate);
QCOMPARE(delegate->x(), 0.0);
- QCOMPARE(delegate->width(), layout->width());
+ QCOMPARE(delegate->width(), label->width());
}
-void tst_qquickdisplaylayout::emptyIconSource()
+void tst_qquickiconlabel::emptyIconSource()
{
- QQuickView view(testFileUrl("layout.qml"));
+ QQuickView view(testFileUrl("iconlabel.qml"));
QCOMPARE(view.status(), QQuickView::Ready);
view.show();
QVERIFY(QTest::qWaitForWindowExposed(&view));
@@ -245,33 +245,33 @@ void tst_qquickdisplaylayout::emptyIconSource()
QQuickItem *rootItem = view.rootObject();
QVERIFY(rootItem);
- QQuickDisplayLayout *layout = qobject_cast<QQuickDisplayLayout*>(rootItem->childItems().first());
- QVERIFY(layout);
- QCOMPARE(layout->spacing(), 0.0);
- QCOMPARE(layout->display(), QQuickDisplayLayout::TextBesideIcon);
- QCOMPARE(layout->isMirrored(), false);
+ QQuickIconLabel *label = qobject_cast<QQuickIconLabel*>(rootItem->childItems().first());
+ QVERIFY(label);
+ QCOMPARE(label->spacing(), 0.0);
+ QCOMPARE(label->display(), QQuickIconLabel::TextBesideIcon);
+ QCOMPARE(label->isMirrored(), false);
- QQuickItem *icon = layout->icon();
+ QQuickItem *icon = label->icon();
QVERIFY(icon);
- QQuickItem *text = layout->text();
+ QQuickItem *text = label->text();
QVERIFY(text);
- qreal horizontalCenter = layout->width() / 2;
+ qreal horizontalCenter = label->width() / 2;
const qreal combinedWidth = icon->width() + text->width();
const qreal contentX = horizontalCenter - combinedWidth / 2;
// The text should be positioned next to an item.
- QCOMPARE(text->x(), contentX + icon->width() + layout->spacing());
+ QCOMPARE(text->x(), contentX + icon->width() + label->spacing());
- // Now give the layout an explicit width large enough so that implicit size
+ // Now give the label an explicit width large enough so that implicit size
// changes in its children don't affect its implicit size.
- layout->setWidth(layout->implicitWidth() + 200);
- layout->setHeight(layout->implicitWidth() + 100);
+ label->setWidth(label->implicitWidth() + 200);
+ label->setHeight(label->implicitWidth() + 100);
QVERIFY(icon->property("source").isValid());
QVERIFY(icon->setProperty("source", QUrl()));
- horizontalCenter = layout->width() / 2;
+ horizontalCenter = label->width() / 2;
QCOMPARE(text->x(), horizontalCenter - text->width() / 2);
}
-QTEST_MAIN(tst_qquickdisplaylayout)
+QTEST_MAIN(tst_qquickiconlabel)
-#include "tst_qquickdisplaylayout.moc"
+#include "tst_qquickiconlabel.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 18:26:43 +0000