1 files changed, 145 insertions, 1 deletions

diff --git a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
index 6d5be7d558..03131cebe4 100644
--- a/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
@@ -1,5 +1,5 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QSignalSpy>
@@ -50,6 +50,7 @@ private slots:
     void hideTab_data();
     void hideTab();
     void hideAllTabs();
+    void checkHiddenTab();
 
     void setElideMode_data();
     void setElideMode();
@@ -99,6 +100,9 @@ private slots:
     void resizeKeepsScroll_data();
     void resizeKeepsScroll();
     void changeTabTextKeepsScroll();
+    void settingCurrentTabBeforeShowDoesntScroll();
+    void checkPositionsAfterShapeChange();
+    void checkScrollOffsetAfterTabRemoval();
 
 private:
     void checkPositions(const TabBar &tabbar, const QList<int> &positions);
@@ -366,6 +370,25 @@ void tst_QTabBar::hideAllTabs()
     QVERIFY(sizeHint.width() < prevSizeHint.width());
 }
 
+void tst_QTabBar::checkHiddenTab()
+{
+    QTabBar tabbar;
+
+    tabbar.addTab("foo");
+    tabbar.addTab("bar");
+    tabbar.addTab("baz");
+    tabbar.setCurrentIndex(0);
+    tabbar.setTabVisible(1, false);
+
+    QKeyEvent keyRight(QKeyEvent::KeyPress, Qt::Key_Right, Qt::NoModifier);
+    QVERIFY(QApplication::sendEvent(&tabbar, &keyRight));
+    QCOMPARE(tabbar.currentIndex(), 2);
+
+    QKeyEvent keyLeft(QKeyEvent::KeyPress, Qt::Key_Left, Qt::NoModifier);
+    QVERIFY(QApplication::sendEvent(&tabbar, &keyLeft));
+    QCOMPARE(tabbar.currentIndex(), 0);
+}
+
 void tst_QTabBar::setElideMode_data()
 {
     QTest::addColumn<int>("tabElideMode");
@@ -1452,5 +1475,126 @@ void tst_QTabBar::changeTabTextKeepsScroll()
     QCOMPARE(getScrollOffset(), scrollOffset);
 }
 
+void tst_QTabBar::settingCurrentTabBeforeShowDoesntScroll()
+{
+    QTabBar tabBar;
+    TabBarScrollingProxyStyle proxyStyle;
+    tabBar.setStyle(&proxyStyle);
+
+    for (int i = 0; i < 6; ++i)
+        tabBar.addTab(u"Tab Number %1"_s.arg(i));
+
+    const auto getScrollOffset = [&]() -> int {
+        return static_cast<QTabBarPrivate *>(QObjectPrivate::get(&tabBar))->scrollOffset;
+    };
+
+    tabBar.setCurrentIndex(5);
+
+    // changing the current index while the tab bar isn't visible shouldn't scroll yet
+    QCOMPARE(getScrollOffset(), 0);
+
+    // now show the tab bar with a size that's too small to fit the current index
+    const QSize fullSize = tabBar.sizeHint();
+    tabBar.resize(fullSize.width() / 2, fullSize.height());
+
+    tabBar.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&tabBar));
+
+    // this should scroll
+    QCOMPARE_GT(getScrollOffset(), 0);
+}
+
+void tst_QTabBar::checkPositionsAfterShapeChange()
+{
+    class TabWidget : public QTabWidget
+    {
+    public:
+        using QTabWidget::QTabWidget;
+        using QTabWidget::setTabBar;
+    };
+  
+    class TabBar : public QTabBar
+    {
+    public:
+        using QTabBar::initStyleOption;
+        void resizeEvent(QResizeEvent *e) override
+        {
+            QTabBar::resizeEvent(e);
+            resized = true;
+        }
+        bool resized = false;
+    };
+
+    TabWidget tabWidget;
+    auto *tabBar = new TabBar;
+    tabWidget.setTabBar(tabBar);
+    for (int i = 0; i < 3; ++i)
+        tabWidget.addTab(new QWidget, u"Tab %1"_s.arg(i));
+    tabWidget.setTabPosition(QTabWidget::North);
+    tabWidget.setCurrentIndex(2);
+    tabWidget.resize(300, 300);
+    tabWidget.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&tabWidget));
+
+    tabBar->resized = false;
+    tabWidget.setTabPosition(QTabWidget::East);
+    QVERIFY(QTest::qWaitFor([&]() { return tabBar->resized; }));
+    QStyleOptionTab opt;
+    tabBar->initStyleOption(&opt, 2);
+    QVERIFY(opt.rect.top() > 0);
+}
+
+void tst_QTabBar::checkScrollOffsetAfterTabRemoval()
+{
+    QTabWidget tabWidget;
+    QTabBar *tabBar = tabWidget.tabBar();
+    for (int i = 0; i < 10; ++i)
+        tabWidget.addTab(new QWidget, u"Tab %1"_s.arg(i));
+    tabWidget.setTabPosition(QTabWidget::North);
+    tabWidget.resize(300, 300);
+    tabWidget.setCurrentIndex(0);
+    tabWidget.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&tabWidget));
+
+    auto *rightButton = tabBar->findChild<QAbstractButton *>(u"ScrollRightButton"_s);
+    auto *leftButton = tabBar->findChild<QAbstractButton *>(u"ScrollLeftButton"_s);
+    QVERIFY(leftButton);
+    QVERIFY(rightButton);
+    QVERIFY(rightButton->isEnabled());
+    QVERIFY(!leftButton->isEnabled());
+    // scroll to the right
+    tabBar->setCurrentIndex(9);
+    QVERIFY(!rightButton->isEnabled());
+    QVERIFY(leftButton->isEnabled());
+    // scroll to the center
+    tabBar->setCurrentIndex(2);
+    QVERIFY(rightButton->isEnabled());
+    QVERIFY(leftButton->isEnabled());
+
+    const auto getScrollOffset = [&]() -> int {
+        return static_cast<QTabBarPrivate *>(QObjectPrivate::get(tabBar))->scrollOffset;
+    };
+    // the scroll offset should not change when a tab right outside
+    // the scroll rect is removed
+    auto oldOffset = getScrollOffset();
+    tabWidget.removeTab(9);
+    QCOMPARE(getScrollOffset(), oldOffset);
+    // the scroll offset must change when a tab left outside
+    // the scroll rect is removed
+    oldOffset = getScrollOffset();
+    tabWidget.removeTab(0);
+    QVERIFY(getScrollOffset() < oldOffset);
+
+    // the scroll offset must change when there is empty
+    // place in the right after tab removal
+    oldOffset = getScrollOffset();
+    QVERIFY(oldOffset > 0);
+    for (int i : { 7, 6, 5, 4, 3 })
+        tabWidget.removeTab(i);
+    QCOMPARE(getScrollOffset(), 0);
+    QVERIFY(!rightButton->isVisible());
+    QVERIFY(!leftButton->isVisible());
+}
+
 QTEST_MAIN(tst_QTabBar)
 #include "tst_qtabbar.moc"