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

Allow for rearranging tabified QDockWidgets

Browse Source 
Allow to drag and drop tabs

[ChangeLog][QtWidgets][Important Behavior Changes] The tabs
for the tabified docks can be moved by the user.

Task-number: QTBUG-1049
Task-number: QTBUG-2295
Task-number: QTBUG-4532
Task-number: QTBUG-18883
Task-number: QTBUG-35148
Change-Id: I7ef9d4987db081654bd5d648e14370b3d381a720
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
This commit is contained in:
Olivier Goffart 2015-03-04 15:07:53 +01:00 committed by Olivier Goffart (Woboq GmbH)
parent 60e8519544
commit 02a13a86fa
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/widgets/widgets/qdockarealayout.cpp
View File

@ -2244,6 +2244,22 @@ QRect QDockAreaLayoutInfo::tabContentRect() const
return result;
}
int QDockAreaLayoutInfo::tabIndexToListIndex(int tabIndex) const
{
Q_ASSERT(tabbed && tabBar);
quintptr data = qvariant_cast<quintptr>(tabBar->tabData(tabIndex));
for (int i = 0; i < item_list.count(); ++i) {
if (tabId(item_list.at(i)) == data)
return i;
}
return -1;
}
void QDockAreaLayoutInfo::moveTab(int from, int to)
{
item_list.move(tabIndexToListIndex(from), tabIndexToListIndex(to));
}
#endif // QT_NO_TABBAR
/******************************************************************************

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

@ -208,6 +208,9 @@ public:
QSize tabBarSizeHint() const;
QSet<QTabBar*> usedTabBars() const;
int tabIndexToListIndex(int) const;
void moveTab(int from, int to);
#endif // QT_NO_TABBAR
};

12
src/widgets/widgets/qmainwindowlayout.cpp
View File

@ -1280,7 +1280,9 @@ QTabBar *QMainWindowLayout::getTabBar()
result->setDrawBase(true);
result->setElideMode(Qt::ElideRight);
result->setDocumentMode(_documentMode);
result->setMovable(true);
connect(result, SIGNAL(currentChanged(int)), this, SLOT(tabChanged()));
connect(result, &QTabBar::tabMoved, this, &QMainWindowLayout::tabMoved);
}
usedTabBars.insert(result);
@ -1316,6 +1318,16 @@ void QMainWindowLayout::tabChanged()
if (QWidget *w = centralWidget())
w->raise();
}
void QMainWindowLayout::tabMoved(int from, int to)
{
QTabBar *tb = qobject_cast<QTabBar*>(sender());
Q_ASSERT(tb);
QDockAreaLayoutInfo *info = layoutState.dockAreaLayout.info(tb);
Q_ASSERT(info);
info->moveTab(from, to);
}
#endif // QT_NO_TABBAR
bool QMainWindowLayout::startSeparatorMove(const QPoint &pos)

1
src/widgets/widgets/qmainwindowlayout_p.h
View File

@ -286,6 +286,7 @@ private Q_SLOTS:
#ifndef QT_NO_DOCKWIDGET
#ifndef QT_NO_TABBAR
void tabChanged();
void tabMoved(int from, int to);
#endif
#endif
private: