56da533b45
If scrollbars are styled with a style sheet that includes a box or removes off the native border, then we never treat them as transient or overlapping. Otherwise, the layout logic in QAbstractScrollArea will show them on top of the viewport, overlapping the content. Add case to the style sheet test baseline test. It's a test for scrollbars in a scroll area, rather than a test for the styling of the scrollbars themselves. Fixes: QTBUG-98289 Pick-to: 6.2 Change-Id: Ic53ad248b3eedd54722ac7b2fe5256a27092dbc1 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
186 lines
5.9 KiB
C++
186 lines
5.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2021 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 <qbaselinetest.h>
|
|
#include <qwidgetbaselinetest.h>
|
|
#include <QtWidgets>
|
|
#include <QByteArray>
|
|
|
|
class tst_Stylesheet : public QWidgetBaselineTest
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
tst_Stylesheet();
|
|
|
|
void loadTestFiles();
|
|
|
|
void doInit() override;
|
|
|
|
private slots:
|
|
void tst_QToolButton_data();
|
|
void tst_QToolButton();
|
|
|
|
void tst_QScrollArea_data();
|
|
void tst_QScrollArea();
|
|
|
|
private:
|
|
QDir styleSheetDir;
|
|
};
|
|
|
|
tst_Stylesheet::tst_Stylesheet()
|
|
{
|
|
QString baseDir = QFINDTESTDATA("qss/default.qss");
|
|
styleSheetDir = QDir(QFileInfo(baseDir).path());
|
|
}
|
|
|
|
void tst_Stylesheet::doInit()
|
|
{
|
|
QFETCH(QString, styleSheet);
|
|
testWindow()->setStyleSheet(styleSheet);
|
|
}
|
|
|
|
void tst_Stylesheet::loadTestFiles()
|
|
{
|
|
QTest::addColumn<QString>("styleSheet");
|
|
|
|
QStringList qssFiles;
|
|
// first add generic test files
|
|
for (const auto &qssFile : styleSheetDir.entryList({QStringLiteral("*.qss")}, QDir::Files | QDir::Readable))
|
|
qssFiles << styleSheetDir.absoluteFilePath(qssFile);
|
|
|
|
// then test-function specific files
|
|
const QString testFunction = QString(QTest::currentTestFunction()).remove("tst_").toLower();
|
|
if (styleSheetDir.cd(testFunction)) {
|
|
for (const auto &qssFile : styleSheetDir.entryList({QStringLiteral("*.qss")}, QDir::Files | QDir::Readable))
|
|
qssFiles << styleSheetDir.absoluteFilePath(qssFile);
|
|
styleSheetDir.cdUp();
|
|
}
|
|
|
|
for (const auto &qssFile : qssFiles) {
|
|
QFileInfo fileInfo(qssFile);
|
|
QFile file(qssFile);
|
|
file.open(QFile::ReadOnly);
|
|
QString styleSheet = QString::fromUtf8(file.readAll());
|
|
QBaselineTest::newRow(fileInfo.baseName().toUtf8()) << styleSheet;
|
|
}
|
|
}
|
|
|
|
void tst_Stylesheet::tst_QToolButton_data()
|
|
{
|
|
loadTestFiles();
|
|
}
|
|
|
|
void tst_Stylesheet::tst_QToolButton()
|
|
{
|
|
const QIcon fileIcon = QApplication::style()->standardIcon(QStyle::SP_FileIcon);
|
|
|
|
QVBoxLayout *vbox = new QVBoxLayout;
|
|
|
|
QHBoxLayout *normalButtons = new QHBoxLayout;
|
|
for (const auto &buttonStyle : {Qt::ToolButtonIconOnly, Qt::ToolButtonTextOnly,
|
|
Qt::ToolButtonTextUnderIcon, Qt::ToolButtonTextBesideIcon}) {
|
|
QToolButton *normal = new QToolButton;
|
|
normal->setToolButtonStyle(buttonStyle);
|
|
normal->setText("Text");
|
|
normal->setIcon(fileIcon);
|
|
normalButtons->addWidget(normal);
|
|
}
|
|
vbox->addLayout(normalButtons);
|
|
|
|
QHBoxLayout *arrowButtons = new QHBoxLayout;
|
|
for (const auto &arrowType : {Qt::LeftArrow, Qt::RightArrow, Qt::UpArrow, Qt::DownArrow}) {
|
|
QToolButton *arrow = new QToolButton;
|
|
arrow->setText("Text");
|
|
arrow->setArrowType(arrowType);
|
|
arrowButtons->addWidget(arrow);
|
|
}
|
|
vbox->addLayout(arrowButtons);
|
|
|
|
QHBoxLayout *arrowWithTextButtons = new QHBoxLayout;
|
|
for (const auto &buttonStyle : {Qt::ToolButtonTextOnly,
|
|
Qt::ToolButtonTextUnderIcon, Qt::ToolButtonTextBesideIcon}) {
|
|
QToolButton *arrow = new QToolButton;
|
|
arrow->setText("Text");
|
|
arrow->setArrowType(Qt::UpArrow);
|
|
arrow->setToolButtonStyle(buttonStyle);
|
|
arrowWithTextButtons->addWidget(arrow);
|
|
}
|
|
vbox->addLayout(arrowWithTextButtons);
|
|
|
|
QHBoxLayout *menuButtons = new QHBoxLayout;
|
|
for (const auto &popupMode : {QToolButton::InstantPopup, QToolButton::MenuButtonPopup,
|
|
QToolButton::DelayedPopup}) {
|
|
QToolButton *menuButton = new QToolButton;
|
|
menuButton->setText("Text");
|
|
menuButton->setIcon(fileIcon);
|
|
QMenu *menuButtonMenu = new QMenu;
|
|
menuButtonMenu->addAction(QIcon(":/icons/align-left.png"), "Left");
|
|
menuButtonMenu->addAction(QIcon(":/icons/align-right.png"), "Right");
|
|
menuButtonMenu->addAction(QIcon(":/icons/align-center.png"), "Center");
|
|
menuButton->setMenu(menuButtonMenu);
|
|
menuButton->setPopupMode(popupMode);
|
|
menuButtons->addWidget(menuButton);
|
|
}
|
|
vbox->addLayout(menuButtons);
|
|
testWindow()->setLayout(vbox);
|
|
|
|
makeVisible();
|
|
QBASELINE_TEST(takeSnapshot());
|
|
}
|
|
|
|
void tst_Stylesheet::tst_QScrollArea_data()
|
|
{
|
|
loadTestFiles();
|
|
}
|
|
|
|
void tst_Stylesheet::tst_QScrollArea()
|
|
{
|
|
QHBoxLayout *layout = new QHBoxLayout;
|
|
QTableWidget *table = new QTableWidget(20, 20);
|
|
layout->addWidget(table);
|
|
testWindow()->setLayout(layout);
|
|
|
|
makeVisible();
|
|
QBASELINE_TEST(takeSnapshot());
|
|
}
|
|
|
|
#define main _realmain
|
|
QTEST_MAIN(tst_Stylesheet)
|
|
#undef main
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
qSetGlobalQHashSeed(0); // Avoid rendering variations caused by QHash randomization
|
|
|
|
QBaselineTest::handleCmdLineArgs(&argc, &argv);
|
|
return _realmain(argc, argv);
|
|
}
|
|
|
|
#include "tst_baseline_stylesheet.moc"
|