Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

TabWidget: Don't emit tabMoved twice in moveTab when (un)pinning tabs

Browse Source
This commit is contained in:
David Rosca 2018-02-12 17:49:27 +01:00
parent b07d9cc976
commit 502ba9284f
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
4 changed files with 126 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
autotests/webtabtest.cpp
View File

@ -18,7 +18,9 @@
#include "webtabtest.h"
#include "autotests.h"
#include "webtab.h"
#include "tabwidget.h"
#include "mainapplication.h"
#include "browserwindow.h"
void WebTabTest::initTestCase()
{
@ -134,4 +136,116 @@ void WebTabTest::prependChildTabsTest()
QCOMPARE(tab1.childTabs(), (QVector<WebTab*>{&tab3, &tab6, &tab5}));
}
void WebTabTest::moveTabTest()
{
BrowserWindow *w = mApp->createWindow(Qz::BW_NewWindow);
QSignalSpy movedSpy(w->tabWidget(), &TabWidget::tabMoved);
w->tabWidget()->addView(QUrl());
w->tabWidget()->addView(QUrl());
w->tabWidget()->addView(QUrl());
w->tabWidget()->addView(QUrl());
QTRY_COMPARE(w->tabWidget()->count(), 5);
WebTab *tab0 = w->tabWidget()->webTab(0);
WebTab *tab1 = w->tabWidget()->webTab(1);
WebTab *tab2 = w->tabWidget()->webTab(2);
WebTab *tab3 = w->tabWidget()->webTab(3);
WebTab *tab4 = w->tabWidget()->webTab(4);
movedSpy.clear();
tab0->moveTab(2); // 1, 2, 0, 3, 4
QCOMPARE(movedSpy.count(), 1);
QCOMPARE(movedSpy.at(0).at(0).toInt(), 0);
QCOMPARE(movedSpy.at(0).at(1).toInt(), 2);
QCOMPARE(w->tabWidget()->webTab(0), tab1);
QCOMPARE(w->tabWidget()->webTab(1), tab2);
QCOMPARE(w->tabWidget()->webTab(2), tab0);
QCOMPARE(w->tabWidget()->webTab(3), tab3);
QCOMPARE(w->tabWidget()->webTab(4), tab4);
movedSpy.clear();
tab4->moveTab(0); // 4, 1, 2, 0, 3
QCOMPARE(movedSpy.count(), 1);
QCOMPARE(movedSpy.at(0).at(0).toInt(), 4);
QCOMPARE(movedSpy.at(0).at(1).toInt(), 0);
tab4->togglePinned(); // [4], 1, 2, 0, 3
movedSpy.clear();
tab2->moveTab(0); // [2, 4], 1, 0, 3
QCOMPARE(tab2->isPinned(), true);
QCOMPARE(movedSpy.count(), 1);
QCOMPARE(movedSpy.at(0).at(0).toInt(), 2);
QCOMPARE(movedSpy.at(0).at(1).toInt(), 0);
movedSpy.clear();
tab0->moveTab(1); // [2, 0, 4], 1, 3
QCOMPARE(tab0->isPinned(), true);
QCOMPARE(movedSpy.count(), 1);
QCOMPARE(movedSpy.at(0).at(0).toInt(), 3);
QCOMPARE(movedSpy.at(0).at(1).toInt(), 1);
QCOMPARE(w->tabWidget()->webTab(0), tab2);
QCOMPARE(w->tabWidget()->webTab(1), tab0);
QCOMPARE(w->tabWidget()->webTab(2), tab4);
QCOMPARE(w->tabWidget()->webTab(3), tab1);
QCOMPARE(w->tabWidget()->webTab(4), tab3);
movedSpy.clear();
tab0->moveTab(0); // [0, 2, 4], 1, 3
QCOMPARE(movedSpy.count(), 1);
QCOMPARE(movedSpy.at(0).at(0).toInt(), 1);
QCOMPARE(movedSpy.at(0).at(1).toInt(), 0);
QCOMPARE(w->tabWidget()->webTab(0), tab0);
QCOMPARE(w->tabWidget()->webTab(1), tab2);
QCOMPARE(w->tabWidget()->webTab(2), tab4);
QCOMPARE(w->tabWidget()->webTab(3), tab1);
QCOMPARE(w->tabWidget()->webTab(4), tab3);
movedSpy.clear();
tab0->moveTab(3); // [2, 4], 1, 0, 3
QCOMPARE(tab0->isPinned(), false);
QCOMPARE(movedSpy.count(), 1);
QCOMPARE(movedSpy.at(0).at(0).toInt(), 0);
QCOMPARE(movedSpy.at(0).at(1).toInt(), 3);
QCOMPARE(w->tabWidget()->webTab(0), tab2);
QCOMPARE(w->tabWidget()->webTab(1), tab4);
QCOMPARE(w->tabWidget()->webTab(2), tab1);
QCOMPARE(w->tabWidget()->webTab(3), tab0);
QCOMPARE(w->tabWidget()->webTab(4), tab3);
movedSpy.clear();
tab2->moveTab(4); // [4], 1, 0, 3, 2
QCOMPARE(tab0->isPinned(), false);
QCOMPARE(movedSpy.count(), 1);
QCOMPARE(movedSpy.at(0).at(0).toInt(), 0);
QCOMPARE(movedSpy.at(0).at(1).toInt(), 4);
movedSpy.clear();
tab4->moveTab(2); // 1, 0, 4, 3, 2
QCOMPARE(tab0->isPinned(), false);
QCOMPARE(movedSpy.count(), 1);
QCOMPARE(movedSpy.at(0).at(0).toInt(), 0);
QCOMPARE(movedSpy.at(0).at(1).toInt(), 2);
QCOMPARE(w->tabWidget()->webTab(0), tab1);
QCOMPARE(w->tabWidget()->webTab(1), tab0);
QCOMPARE(w->tabWidget()->webTab(2), tab4);
QCOMPARE(w->tabWidget()->webTab(3), tab3);
QCOMPARE(w->tabWidget()->webTab(4), tab2);
// Invalid moves
movedSpy.clear();
tab4->moveTab(tab4->tabIndex());
tab4->moveTab(-1);
tab4->moveTab(5);
tab4->moveTab(6);
QCOMPARE(movedSpy.count(), 0);
}
FALKONTEST_MAIN(WebTabTest)

1
autotests/webtabtest.h
View File

@ -30,4 +30,5 @@ private slots:
void parentChildTabsTest();
void prependChildTabsTest();
void moveTabTest();
};

12
src/lib/tabwidget/tabwidget.cpp
View File

@ -528,7 +528,9 @@ void TabWidget::tabWasMoved(int before, int after)
m_lastBackgroundTab = nullptr;
emit changed();
emit tabMoved(before, after);
if (!m_blockTabMovedSignal) {
emit tabMoved(before, after);
}
}
void TabWidget::setCurrentIndex(int index)
@ -651,21 +653,27 @@ void TabWidget::closeToLeft(int index)
void TabWidget::moveTab(int from, int to)
{
if (!validIndex(to) || from == to) {
return;
}
WebTab *tab = webTab(from);
if (!tab) {
return;
}
m_blockTabMovedSignal = true;
// (Un)pin tab when needed
if ((tab->isPinned() && to >= pinnedTabsCount()) || (!tab->isPinned() && to < pinnedTabsCount())) {
tab->togglePinned();
}
TabStackedWidget::moveTab(tab->tabIndex(), to);
m_blockTabMovedSignal = false;
emit tabMoved(from, to);
}
int TabWidget::pinUnPinTab(int index, const QString &title)
{
const int newIndex = TabStackedWidget::pinUnPinTab(index, title);
if (index != newIndex) {
if (index != newIndex && !m_blockTabMovedSignal) {
emit tabMoved(index, newIndex);
}
return newIndex;

1
src/lib/tabwidget/tabwidget.h
View File

@ -179,6 +179,7 @@ private:
QUrl m_urlOnNewTab;
bool m_currentTabFresh;
bool m_blockTabMovedSignal = false;
};
#endif // TABWIDGET_H