91fa300cbe
For the time being, no more stretched QComboBox. They were already looking bad before and nobody complained, so it's a non-issue. In the future, we might use square combo boxes in the same way as we do for push buttons but for non-editable QComboBox only. Removes what is now dead code, including some leftovers. tst_QMacStyle updated to reflect size changes to accom- modate the focus ring. Change-Id: I60fac86b9acb52cc96373bca0b3cad598ec4f1e7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
409 lines
13 KiB
C++
409 lines
13 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** 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.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
|
|
#include <QtTest/QtTest>
|
|
#include <QtWidgets>
|
|
#include <private/qstylehelper_p.h>
|
|
|
|
const int N = 1;
|
|
|
|
Q_DECLARE_METATYPE(QStyleHelper::WidgetSizePolicy);
|
|
|
|
#define CT(E) \
|
|
static const ControlType E = QSizePolicy::E;
|
|
|
|
typedef QSizePolicy::ControlType ControlType;
|
|
|
|
CT(DefaultType)
|
|
CT(ButtonBox)
|
|
CT(CheckBox)
|
|
CT(ComboBox)
|
|
CT(Frame)
|
|
CT(GroupBox)
|
|
CT(Label)
|
|
CT(Line)
|
|
CT(LineEdit)
|
|
CT(PushButton)
|
|
CT(RadioButton)
|
|
CT(Slider)
|
|
CT(SpinBox)
|
|
CT(TabWidget)
|
|
CT(ToolButton)
|
|
|
|
|
|
class tst_QMacStyle : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_QMacStyle() { qRegisterMetaType<QStyleHelper::WidgetSizePolicy>("WidgetSizePolicy"); }
|
|
|
|
private slots:
|
|
void sizeHints_data();
|
|
void sizeHints();
|
|
void layoutMargins_data();
|
|
void layoutMargins();
|
|
void layoutSpacings_data();
|
|
void layoutSpacings();
|
|
void smallMiniNormalExclusivity_data();
|
|
void smallMiniNormalExclusivity();
|
|
void passwordCharacter();
|
|
|
|
private:
|
|
static QSize msh(QWidget *widget);
|
|
static QSize sh(QWidget *widget);
|
|
static QRect geo(QWidget *widget);
|
|
static QPoint pos(QWidget *widget) { return geo(widget).topLeft(); }
|
|
static QSize size(QWidget *widget) { return geo(widget).size(); }
|
|
static QSize gap(QWidget *widget1, QWidget *widget2);
|
|
static int hgap(QWidget *widget1, QWidget *widget2) { return gap(widget1, widget2).width(); }
|
|
static int vgap(QWidget *widget1, QWidget *widget2) { return gap(widget1, widget2).height(); }
|
|
static void setSize(QWidget *widget, QStyleHelper::WidgetSizePolicy size);
|
|
static int spacing(ControlType control1, ControlType control2, Qt::Orientation orientation,
|
|
QStyleOption *option = 0, QWidget *widget = 0);
|
|
static int hspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size = QStyleHelper::SizeLarge);
|
|
static int vspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size = QStyleHelper::SizeLarge);
|
|
};
|
|
|
|
#define SIZE(x, y, z) \
|
|
((size == QStyleHelper::SizeLarge) ? (x) : (size == QStyleHelper::SizeSmall) ? (y) : (z))
|
|
|
|
void tst_QMacStyle::sizeHints_data()
|
|
{
|
|
QTest::addColumn<QStyleHelper::WidgetSizePolicy>("size");
|
|
QTest::newRow("normal") << QStyleHelper::SizeLarge;
|
|
// QTest::newRow("small") << QStyleHelper::SizeSmall;
|
|
// QTest::newRow("mini") << QStyleHelper::SizeMini;
|
|
}
|
|
|
|
void tst_QMacStyle::sizeHints()
|
|
{
|
|
QFETCH(QStyleHelper::WidgetSizePolicy, size);
|
|
QDialog w;
|
|
setSize(&w, size);
|
|
|
|
QLineEdit lineEdit1(&w);
|
|
QCOMPARE(sh(&lineEdit1).height(), SIZE(21, 19, 16)); // 16 in Builder, 15 in AHIG
|
|
|
|
QProgressBar progress1(&w);
|
|
progress1.setOrientation(Qt::Horizontal);
|
|
qDebug() << "sh" << progress1.sizeHint();
|
|
QCOMPARE(sh(&progress1).height(), SIZE(16, 10, 10)); // Builder
|
|
|
|
progress1.setOrientation(Qt::Vertical);
|
|
QCOMPARE(sh(&progress1).width(), SIZE(16, 10, 10)); // Builder
|
|
|
|
QRadioButton radio1("Radio", &w);
|
|
QCOMPARE(sh(&radio1).height(), SIZE(14, 12, 10)); // Builder
|
|
|
|
QCheckBox checkBox1("Switch", &w);
|
|
QCOMPARE(sh(&checkBox1).height(), SIZE(13, 12, 10)); // Builder
|
|
|
|
QComboBox comboBox1(&w);
|
|
comboBox1.setEditable(false);
|
|
comboBox1.addItem("Foo");
|
|
QCOMPARE(sh(&comboBox1).height(), SIZE(26, 17, 15));
|
|
|
|
QComboBox comboBox2(&w);
|
|
comboBox2.setEditable(true);
|
|
comboBox2.addItem("Foo");
|
|
QCOMPARE(sh(&comboBox2).height(), SIZE(26, 17, 15));
|
|
|
|
// Combos in toolbars use the actual widget rect to
|
|
// avoid faulty clipping:
|
|
QToolBar tb;
|
|
setSize(&tb, size);
|
|
QComboBox comboBox3(&tb);
|
|
comboBox3.addItem("Foo");
|
|
QCOMPARE(sh(&comboBox3).height(), SIZE(32, -1, -1));
|
|
|
|
QSlider slider1(Qt::Horizontal, &w);
|
|
QCOMPARE(sh(&slider1).height(), SIZE(15, 12, 10));
|
|
|
|
slider1.setTickPosition(QSlider::TicksAbove);
|
|
QCOMPARE(sh(&slider1).height(), SIZE(24, 17, 16)); // Builder
|
|
|
|
slider1.setTickPosition(QSlider::TicksBelow);
|
|
QCOMPARE(sh(&slider1).height(), SIZE(24, 17, 16)); // Builder
|
|
|
|
slider1.setTickPosition(QSlider::TicksBothSides);
|
|
QVERIFY(sh(&slider1).height() > SIZE(15, 12, 10)); // common sense
|
|
|
|
QPushButton ok1("OK", &w);
|
|
QPushButton cancel1("Cancel", &w);
|
|
|
|
QSize s1 = sh(&ok1);
|
|
if (size == QStyleHelper::SizeLarge) {
|
|
// AHIG says 68, Builder does 70, and Qt seems to do 69
|
|
QVERIFY(s1.width() >= 68 && s1.width() <= 70);
|
|
}
|
|
QCOMPARE(s1.height(), SIZE(20, 17, 14)); // 14 in Builder, 15 in AHIG
|
|
|
|
// Cancel should be identical to OK, no matter what
|
|
QCOMPARE(s1, sh(&cancel1));
|
|
|
|
// Play with auto-default and default
|
|
cancel1.setAutoDefault(false);
|
|
QCOMPARE(s1, sh(&cancel1));
|
|
cancel1.setAutoDefault(true);
|
|
QCOMPARE(s1, sh(&cancel1));
|
|
cancel1.setDefault(true);
|
|
QCOMPARE(s1, sh(&cancel1));
|
|
|
|
QDialogButtonBox bbox(&w);
|
|
bbox.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
|
QCOMPARE(s1, sh(bbox.button(QDialogButtonBox::Ok)));
|
|
QCOMPARE(s1, sh(bbox.button(QDialogButtonBox::Cancel)));
|
|
|
|
QMessageBox mbox(&w);
|
|
mbox.setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
|
|
QCOMPARE(s1, sh(mbox.button(QMessageBox::Ok)));
|
|
QCOMPARE(s1, sh(mbox.button(QMessageBox::Cancel)));
|
|
|
|
/*
|
|
QSpinBox spinBox1(&w);
|
|
int h1 = sh(&spinBox1).height();
|
|
QCOMPARE(h1, SIZE(22, 19, 15));
|
|
|
|
QDateEdit date1(&w);
|
|
QCOMPARE(sh(&date1).height(), h1);
|
|
|
|
QTimeEdit time1(&w);
|
|
QCOMPARE(sh(&time1).height(), h1);
|
|
|
|
QDateTimeEdit dateTime1(&w);
|
|
QCOMPARE(sh(&dateTime1).height(), h1);
|
|
|
|
ok1.setAttribute(Qt::WA_MacMetalStyle, true);
|
|
QSize s2 = sh(&ok1);
|
|
if (size == Normal) {
|
|
QVERIFY(s2.height() >= 21 && s2.height() <= 32);
|
|
} else {
|
|
QVERIFY(s2.height() >= 18 && s2.height() <= 24);
|
|
}
|
|
*/
|
|
|
|
// QMacStyle bug: label doesn't react to Small and Mini
|
|
QLabel label1("Blah", &w);
|
|
QCOMPARE(sh(&label1).height(), SIZE(16, 14, 11));
|
|
}
|
|
|
|
void tst_QMacStyle::layoutMargins_data()
|
|
{
|
|
tst_QMacStyle::sizeHints_data();
|
|
}
|
|
|
|
void tst_QMacStyle::layoutMargins()
|
|
{
|
|
QFETCH(QStyleHelper::WidgetSizePolicy, size);
|
|
QWidget w;
|
|
setSize(&w, size);
|
|
|
|
}
|
|
|
|
void tst_QMacStyle::layoutSpacings_data()
|
|
{
|
|
tst_QMacStyle::sizeHints_data();
|
|
}
|
|
|
|
void tst_QMacStyle::layoutSpacings()
|
|
{
|
|
QFETCH(QStyleHelper::WidgetSizePolicy, size);
|
|
|
|
/*
|
|
Constraints specified by AHIG.
|
|
*/
|
|
|
|
for (int i = 0; i < 4; ++i) {
|
|
ControlType c1 = (i % 2 == 0) ? PushButton : ButtonBox;
|
|
ControlType c2 = (i / 2 == 0) ? PushButton : ButtonBox;
|
|
QCOMPARE(hspacing(c1, c2, size), SIZE(14, 8, 8));
|
|
QCOMPARE(vspacing(c1, c2, size), SIZE(14, 8, 8));
|
|
}
|
|
|
|
QCOMPARE(hspacing(Label, RadioButton, size), SIZE(8, 6, 5));
|
|
QCOMPARE(vspacing(RadioButton, RadioButton, size), SIZE(5, 5, 5)); // Builder, guess, AHIG
|
|
|
|
QCOMPARE(hspacing(Label, CheckBox, size), SIZE(8, 6, 5));
|
|
QCOMPARE(vspacing(CheckBox, CheckBox, size), SIZE(8, 8, 7));
|
|
|
|
QCOMPARE(hspacing(Label, ComboBox, size), SIZE(8, 6, 5));
|
|
|
|
QCOMPARE(hspacing(LineEdit, LineEdit, size), SIZE(10, 8, 8));
|
|
|
|
/*
|
|
Common sense constraints, for when AHIG seems to make no sense (e.g., disagrees
|
|
too much with Builder or looks improper).
|
|
*/
|
|
|
|
// Comboboxes are a special pain, because AHIG and Builder can't agree,
|
|
// and because they can be editable or not, with two totally different looks
|
|
QVERIFY(vspacing(ComboBox, ComboBox, size) >= SIZE(8, 6, 5));
|
|
QVERIFY(vspacing(ComboBox, ComboBox, size) <= SIZE(12, 10, 8));
|
|
|
|
// Make sure button boxes get the respect they deserve, when they occur
|
|
// in the bottom or right side of a dialog
|
|
QCOMPARE(hspacing(ButtonBox, LineEdit), SIZE(20, 8, 8));
|
|
QCOMPARE(vspacing(ButtonBox, LineEdit), SIZE(20, 7, 7));
|
|
|
|
QCOMPARE(hspacing(LineEdit, ButtonBox), SIZE(8, 8, 8));
|
|
QCOMPARE(vspacing(LineEdit, ButtonBox), SIZE(8, 8, 8));
|
|
}
|
|
|
|
// helper functions
|
|
|
|
QSize tst_QMacStyle::msh(QWidget *widget)
|
|
{
|
|
QWidgetItem item(widget);
|
|
return item.sizeHint();
|
|
}
|
|
|
|
QSize tst_QMacStyle::sh(QWidget *widget)
|
|
{
|
|
QWidgetItem item(widget);
|
|
return item.sizeHint();
|
|
}
|
|
|
|
QRect tst_QMacStyle::geo(QWidget *widget)
|
|
{
|
|
QWidgetItem item(widget);
|
|
return item.geometry();
|
|
}
|
|
|
|
QSize tst_QMacStyle::gap(QWidget *widget1, QWidget *widget2)
|
|
{
|
|
QPoint d = pos(widget2) - pos(widget1);
|
|
QSize s = size(widget1);
|
|
return s + QSize(d.x(), d.y());
|
|
}
|
|
|
|
void tst_QMacStyle::setSize(QWidget *widget, QStyleHelper::WidgetSizePolicy size)
|
|
{
|
|
switch (size) {
|
|
case QStyleHelper::SizeLarge:
|
|
widget->setAttribute(Qt::WA_MacNormalSize, true);
|
|
break;
|
|
case QStyleHelper::SizeSmall:
|
|
widget->setAttribute(Qt::WA_MacSmallSize, true);
|
|
break;
|
|
case QStyleHelper::SizeMini:
|
|
widget->setAttribute(Qt::WA_MacMiniSize, true);
|
|
}
|
|
}
|
|
|
|
int tst_QMacStyle::spacing(ControlType control1, ControlType control2, Qt::Orientation orientation,
|
|
QStyleOption *option, QWidget *widget)
|
|
{
|
|
return QApplication::style()->layoutSpacing(control1, control2, orientation, option, widget);
|
|
}
|
|
|
|
int tst_QMacStyle::hspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size)
|
|
{
|
|
QWidget w;
|
|
setSize(&w, size);
|
|
|
|
QStyleOption opt;
|
|
opt.initFrom(&w);
|
|
|
|
return spacing(control1, control2, Qt::Horizontal, &opt);
|
|
}
|
|
|
|
int tst_QMacStyle::vspacing(ControlType control1, ControlType control2, QStyleHelper::WidgetSizePolicy size)
|
|
{
|
|
QWidget w;
|
|
setSize(&w, size);
|
|
|
|
QStyleOption opt;
|
|
opt.initFrom(&w);
|
|
|
|
return spacing(control1, control2, Qt::Vertical, &opt);
|
|
}
|
|
|
|
|
|
void tst_QMacStyle::smallMiniNormalExclusivity_data()
|
|
{
|
|
|
|
QTest::addColumn<int>("size1");
|
|
QTest::addColumn<int>("size2");
|
|
QTest::addColumn<int>("size3");
|
|
QTest::addColumn<int>("expectedHeight1");
|
|
QTest::addColumn<int>("expectedHeight2");
|
|
QTest::addColumn<int>("expectedHeight3");
|
|
|
|
QTest::newRow("normal small mini") << int(Qt::WA_MacNormalSize) << int(Qt::WA_MacSmallSize) << int(Qt::WA_MacMiniSize) << 32 << 16 << 24;
|
|
QTest::newRow("normal mini small") << int(Qt::WA_MacNormalSize) <<int(Qt::WA_MacMiniSize) << int(Qt::WA_MacSmallSize) << 32 << 24 << 16;
|
|
QTest::newRow("small normal mini") << int(Qt::WA_MacSmallSize) << int(Qt::WA_MacNormalSize) << int(Qt::WA_MacMiniSize) << 16 << 32 << 24;
|
|
QTest::newRow("small mini normal") << int(Qt::WA_MacSmallSize) << int(Qt::WA_MacMiniSize) << int(Qt::WA_MacNormalSize) << 16 << 24 << 32;
|
|
QTest::newRow("mini small normal") << int(Qt::WA_MacMiniSize) << int(Qt::WA_MacSmallSize) << int(Qt::WA_MacNormalSize) << 24 << 16 << 32;
|
|
QTest::newRow("mini normal small") << int(Qt::WA_MacMiniSize) << int(Qt::WA_MacNormalSize) << int(Qt::WA_MacSmallSize) << 24 << 32 << 16;
|
|
}
|
|
|
|
void tst_QMacStyle::smallMiniNormalExclusivity()
|
|
{
|
|
|
|
QFETCH(int, size1);
|
|
QFETCH(int, size2);
|
|
QFETCH(int, size3);
|
|
QFETCH(int, expectedHeight1);
|
|
QFETCH(int, expectedHeight2);
|
|
QFETCH(int, expectedHeight3);
|
|
|
|
static const int TotalSizes = 3;
|
|
int attrs[TotalSizes] = { size1, size2, size3 };
|
|
int expected[TotalSizes] = { expectedHeight1, expectedHeight2, expectedHeight3 };
|
|
|
|
QPushButton dummyWidget;
|
|
QStyleOptionButton opt;
|
|
|
|
for (int i = 0; i < TotalSizes; ++i) {
|
|
dummyWidget.setAttribute(Qt::WidgetAttribute(attrs[i]));
|
|
opt.initFrom(&dummyWidget);
|
|
QSize size = dummyWidget.style()->sizeFromContents(QStyle::CT_PushButton, &opt,
|
|
QSize(0, 0), &dummyWidget);
|
|
if (size.height() != expected[i])
|
|
QEXPECT_FAIL("", "QTBUG-25296", Abort);
|
|
QCOMPARE(size.height(), expected[i]);
|
|
}
|
|
}
|
|
|
|
void tst_QMacStyle::passwordCharacter()
|
|
{
|
|
QLineEdit lineEdit;
|
|
lineEdit.setEchoMode(QLineEdit::Password);
|
|
QTest::keyClick(&lineEdit, Qt::Key_P);
|
|
// Should be no password delay; text should instantly be masked.
|
|
const QChar bullet(0x2022);
|
|
const QString expected(1, bullet);
|
|
QCOMPARE(lineEdit.displayText(), expected);
|
|
}
|
|
|
|
QTEST_MAIN(tst_QMacStyle)
|
|
#include "tst_qmacstyle.moc"
|
|
|