AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_qtabbar sizeHints fix

Browse Source 
tst_qtabbar uses fixed values to check the minimumSizeHint and it fails
with screens that have a higher resolution. The test still uses the
default values, but now in the beginning it creates enough tabs so that
it goes over the default.

Change-Id: I3f891d2661288d7fad50ad522d73f634b3e91958
Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
This commit is contained in:
Milla Pohjanheimo 2016-03-15 07:44:09 +02:00
parent 5393ba970b
commit e363817498
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
View File

@ -279,36 +279,30 @@ void tst_QTabBar::sizeHints()
{ {
QTabBar tabBar; QTabBar tabBar;
tabBar.setFont(QFont("Arial", 10)); tabBar.setFont(QFont("Arial", 10));
tabBar.addTab("tab 01");
tabBar.addTab("tab 02");
tabBar.addTab("tab 03");
tabBar.addTab("tab 04");
tabBar.addTab("tab 05");
tabBar.addTab("tab 06");
tabBar.addTab("This is tab7");
tabBar.addTab("This is tab8");
tabBar.addTab("This is tab9 with a very long title");
// No eliding and no scrolling -> tabbar becomes very wide // No eliding and no scrolling -> tabbar becomes very wide
tabBar.setUsesScrollButtons(false); tabBar.setUsesScrollButtons(false);
tabBar.setElideMode(Qt::ElideNone); tabBar.setElideMode(Qt::ElideNone);
// qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint(); tabBar.addTab("tab 01");
#ifdef Q_OS_MAC
QEXPECT_FAIL("", "QTBUG-27230", Abort); // Fetch the minimum size hint width and make sure that we create enough
#endif // tabs.
int minimumSizeHintWidth = tabBar.minimumSizeHint().width();
for (int i = 0; i <= 700 / minimumSizeHintWidth; ++i)
tabBar.addTab(QString("tab 0%1").arg(i+2));
//qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint();
QVERIFY(tabBar.minimumSizeHint().width() > 700); QVERIFY(tabBar.minimumSizeHint().width() > 700);
QVERIFY(tabBar.sizeHint().width() > 700); QVERIFY(tabBar.sizeHint().width() > 700);
// Scrolling enabled -> no reason to become very wide // Scrolling enabled -> no reason to become very wide
tabBar.setUsesScrollButtons(true); tabBar.setUsesScrollButtons(true);
// qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint();
QVERIFY(tabBar.minimumSizeHint().width() < 200); QVERIFY(tabBar.minimumSizeHint().width() < 200);
QVERIFY(tabBar.sizeHint().width() > 700); // unchanged QVERIFY(tabBar.sizeHint().width() > 700); // unchanged
// Eliding enabled -> no reason to become very wide // Eliding enabled -> no reason to become very wide
tabBar.setUsesScrollButtons(false); tabBar.setUsesScrollButtons(false);
tabBar.setElideMode(Qt::ElideRight); tabBar.setElideMode(Qt::ElideRight);
// qDebug() << tabBar.minimumSizeHint() << tabBar.sizeHint();
// The sizeHint is very much dependent on the screen DPI value // The sizeHint is very much dependent on the screen DPI value
// so we can not really predict it. // so we can not really predict it.
@ -317,7 +311,7 @@ void tst_QTabBar::sizeHints()
QVERIFY(tabBarMinSizeHintWidth < tabBarSizeHintWidth); QVERIFY(tabBarMinSizeHintWidth < tabBarSizeHintWidth);
QVERIFY(tabBarSizeHintWidth > 700); // unchanged QVERIFY(tabBarSizeHintWidth > 700); // unchanged
tabBar.addTab("This is tab10 with a very long title"); tabBar.addTab("This is tab with a very long title");
QVERIFY(tabBar.minimumSizeHint().width() > tabBarMinSizeHintWidth); QVERIFY(tabBar.minimumSizeHint().width() > tabBarMinSizeHintWidth);
QVERIFY(tabBar.sizeHint().width() > tabBarSizeHintWidth); QVERIFY(tabBar.sizeHint().width() > tabBarSizeHintWidth);
} }