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

Add useful signals to QTabBar and QTabWidget

Browse Source 
In this patch we introduce tabBarClicked and tabBarDoubleClicked to get
a finer grained information on the user interaction with the tab bar.

Done-with: kevin.ottens@kdab.com

Change-Id: I7be76a556ca09186e98f2e076fe2512d6c5e6773
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
This commit is contained in:
Ivan Komissarov 2012-06-28 21:04:54 +04:00 committed by The Qt Project
parent 91e86688fc
commit 252bad7c58
6 changed files with 159 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/widgets/widgets/qtabbar.cpp
View File

@ -329,6 +329,26 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const
\sa moveTab()
*/
/*!
\fn void QTabBar::tabBarClicked(int index)
This signal is emitted when user clicks on a tab at an \a index.
\a index is the index of a clicked tab, or -1 if no tab is under the cursor.
\since 5.2
*/
/*!
\fn void QTabBar::tabBarDoubleClicked(int index)
This signal is emitted when the user double clicks on a tab at \a index.
\a index refers to the tab clicked, or -1 if no tab is under the cursor.
\since 5.2
*/
int QTabBarPrivate::extraWidth() const
{
Q_Q(const QTabBar);
@ -1703,11 +1723,37 @@ void QTabBarPrivate::moveTab(int index, int offset)
q_func()->update();
}
/*!
\reimp
*/
void QTabBar::mouseDoubleClickEvent(QMouseEvent *event)
{
Q_D(QTabBar);
const QPoint pos = event->pos();
const bool isEventInCornerButtons = (!d->leftB->isHidden() && d->leftB->geometry().contains(pos))
|| (!d->rightB->isHidden() && d->rightB->geometry().contains(pos));
if (!isEventInCornerButtons) {
const int index = tabAt(pos);
emit tabBarDoubleClicked(index);
}
}
/*!\reimp
*/
void QTabBar::mousePressEvent(QMouseEvent *event)
{
Q_D(QTabBar);
const QPoint pos = event->pos();
const bool isEventInCornerButtons = (!d->leftB->isHidden() && d->leftB->geometry().contains(pos))
|| (!d->rightB->isHidden() && d->rightB->geometry().contains(pos));
if (!isEventInCornerButtons) {
const int index = d->indexAtPos(pos);
emit tabBarClicked(index);
}
if (event->button() != Qt::LeftButton) {
event->ignore();
return;

3
src/widgets/widgets/qtabbar.h
View File

@ -173,6 +173,8 @@ Q_SIGNALS:
void currentChanged(int index);
void tabCloseRequested(int index);
void tabMoved(int from, int to);
void tabBarClicked(int index);
void tabBarDoubleClicked(int index);
protected:
virtual QSize tabSizeHint(int index) const;
@ -186,6 +188,7 @@ protected:
void showEvent(QShowEvent *);
void hideEvent(QHideEvent *);
void paintEvent(QPaintEvent *);
void mouseDoubleClickEvent(QMouseEvent *);
void mousePressEvent (QMouseEvent *);
void mouseMoveEvent (QMouseEvent *);
void mouseReleaseEvent (QMouseEvent *);

24
src/widgets/widgets/qtabwidget.cpp
View File

@ -172,6 +172,26 @@ QT_BEGIN_NAMESPACE
\sa setTabsClosable()
*/
/*!
\fn void QTabWidget::tabBarClicked(int index)
This signal is emitted when user clicks on a tab at an \a index.
\a index refers to the tab clicked, or -1 if no tab is under the cursor.
\since 5.2
*/
/*!
\fn void QTabWidget::tabBarDoubleClicked(int index)
This signal is emitted when the user double clicks on a tab at an \a index.
\a index is the index of a clicked tab, or -1 if no tab is under the cursor.
\since 5.2
*/
class QTabWidgetPrivate : public QWidgetPrivate
{
Q_DECLARE_PUBLIC(QTabWidget)
@ -693,6 +713,10 @@ void QTabWidget::setTabBar(QTabBar* tb)
this, SLOT(_q_showTab(int)));
connect(d->tabs, SIGNAL(tabMoved(int,int)),
this, SLOT(_q_tabMoved(int,int)));
connect(d->tabs, SIGNAL(tabBarClicked(int)),
this, SIGNAL(tabBarClicked(int)));
connect(d->tabs, SIGNAL(tabBarDoubleClicked(int)),
this, SIGNAL(tabBarDoubleClicked(int)));
if (d->tabs->tabsClosable())
connect(d->tabs, SIGNAL(tabCloseRequested(int)),
this, SIGNAL(tabCloseRequested(int)));

2
src/widgets/widgets/qtabwidget.h
View File

@ -151,6 +151,8 @@ public Q_SLOTS:
Q_SIGNALS:
void currentChanged(int index);
void tabCloseRequested(int index);
void tabBarClicked(int index);
void tabBarDoubleClicked(int index);
protected:
virtual void tabInserted(int index);

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

@ -97,6 +97,8 @@ private slots:
void changeTitleWhileDoubleClickingTab();
void taskQTBUG_10052_widgetLayoutWhenMoving();
void tabBarClicked();
};
// Testing get/set functions
@ -652,5 +654,45 @@ void tst_QTabBar::taskQTBUG_10052_widgetLayoutWhenMoving()
QVERIFY(w2.moved);
}
void tst_QTabBar::tabBarClicked()
{
QTabBar tabBar;
tabBar.addTab("0");
QSignalSpy clickSpy(&tabBar, SIGNAL(tabBarClicked(int)));
QSignalSpy doubleClickSpy(&tabBar, SIGNAL(tabBarDoubleClicked(int)));
QCOMPARE(clickSpy.count(), 0);
QCOMPARE(doubleClickSpy.count(), 0);
Qt::MouseButton button = Qt::LeftButton;
while (button <= Qt::MaxMouseButton) {
const QPoint tabPos = tabBar.tabRect(0).center();
QTest::mouseClick(&tabBar, button, 0, tabPos);
QCOMPARE(clickSpy.count(), 1);
QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), 0);
QCOMPARE(doubleClickSpy.count(), 0);
QTest::mouseDClick(&tabBar, button, 0, tabPos);
QCOMPARE(clickSpy.count(), 0);
QCOMPARE(doubleClickSpy.count(), 1);
QCOMPARE(doubleClickSpy.takeFirst().takeFirst().toInt(), 0);
const QPoint barPos(tabBar.tabRect(0).right() + 5, tabBar.tabRect(0).center().y());
QTest::mouseClick(&tabBar, button, 0, barPos);
QCOMPARE(clickSpy.count(), 1);
QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), -1);
QCOMPARE(doubleClickSpy.count(), 0);
QTest::mouseDClick(&tabBar, button, 0, barPos);
QCOMPARE(clickSpy.count(), 0);
QCOMPARE(doubleClickSpy.count(), 1);
QCOMPARE(doubleClickSpy.takeFirst().takeFirst().toInt(), -1);
button = Qt::MouseButton(button << 1);
}
}
QTEST_MAIN(tst_QTabBar)
#include "tst_qtabbar.moc"

42
tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
View File

@ -42,6 +42,7 @@
#include <QtTest/QtTest>
#include <qtabwidget.h>
#include <qtabbar.h>
#include <qdebug.h>
#include <qapplication.h>
#include <qlabel.h>
@ -110,6 +111,7 @@ class tst_QTabWidget:public QObject {
void minimumSizeHint();
void heightForWidth_data();
void heightForWidth();
void tabBarClicked();
private:
int addPage();
@ -666,6 +668,46 @@ void tst_QTabWidget::heightForWidth()
delete window;
}
void tst_QTabWidget::tabBarClicked()
{
QTabWidget tabWidget;
tabWidget.addTab(new QWidget(&tabWidget), "0");
QSignalSpy clickSpy(&tabWidget, SIGNAL(tabBarClicked(int)));
QSignalSpy doubleClickSpy(&tabWidget, SIGNAL(tabBarDoubleClicked(int)));
QCOMPARE(clickSpy.count(), 0);
QCOMPARE(doubleClickSpy.count(), 0);
QTabBar &tabBar = *tabWidget.tabBar();
Qt::MouseButton button = Qt::LeftButton;
while (button <= Qt::MaxMouseButton) {
const QPoint tabPos = tabBar.tabRect(0).center();
QTest::mouseClick(&tabBar, button, 0, tabPos);
QCOMPARE(clickSpy.count(), 1);
QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), 0);
QCOMPARE(doubleClickSpy.count(), 0);
QTest::mouseDClick(&tabBar, button, 0, tabPos);
QCOMPARE(clickSpy.count(), 0);
QCOMPARE(doubleClickSpy.count(), 1);
QCOMPARE(doubleClickSpy.takeFirst().takeFirst().toInt(), 0);
const QPoint barPos(tabBar.tabRect(0).right() + 5, tabBar.tabRect(0).center().y());
QTest::mouseClick(&tabBar, button, 0, barPos);
QCOMPARE(clickSpy.count(), 1);
QCOMPARE(clickSpy.takeFirst().takeFirst().toInt(), -1);
QCOMPARE(doubleClickSpy.count(), 0);
QTest::mouseDClick(&tabBar, button, 0, barPos);
QCOMPARE(clickSpy.count(), 0);
QCOMPARE(doubleClickSpy.count(), 1);
QCOMPARE(doubleClickSpy.takeFirst().takeFirst().toInt(), -1);
button = Qt::MouseButton(button << 1);
}
}
QTEST_MAIN(tst_QTabWidget)
#include "tst_qtabwidget.moc"