DockWidgetMovable feature implemented

In my implementation DockWidgetMovable feature also not allows tab to float.
This commit is contained in:
Opostol 2018-08-10 13:54:09 +03:00 committed by GitHub
parent f823b67a4a
commit 3fc7c195c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -240,16 +240,19 @@ void CDockWidgetTitleBar::mouseReleaseEvent(QMouseEvent* ev)
// End of tab moving, change order now
if (d->isDraggingState(DraggingTab) && d->DockArea)
{
// Find tab under mouse
QPoint pos = d->DockArea->mapFromGlobal(ev->globalPos());
int fromIndex = d->DockArea->tabIndex(d->DockWidget);
int toIndex = d->DockArea->indexOfContentByTitlePos(pos, this);
if (-1 == toIndex)
{
toIndex = d->DockArea->count() - 1;
if (d->DockWidget->features() & CDockWidget::DockWidgetMovable) {
// Find tab under mouse
QPoint pos = d->DockArea->mapFromGlobal(ev->globalPos());
int fromIndex = d->DockArea->tabIndex(d->DockWidget);
int toIndex = d->DockArea->indexOfContentByTitlePos(pos, this);
if (-1 == toIndex)
{
toIndex = d->DockArea->count() - 1;
}
qDebug() << "Move tab from " << fromIndex << " to " << toIndex;
d->DockArea->reorderDockWidget(fromIndex, toIndex);
}
qDebug() << "Move tab from " << fromIndex << " to " << toIndex;
d->DockArea->reorderDockWidget(fromIndex, toIndex);
}
if (!d->DragStartMousePosition.isNull())
@ -275,7 +278,9 @@ void CDockWidgetTitleBar::mouseMoveEvent(QMouseEvent* ev)
if (d->isDraggingState(DraggingFloatingWidget))
{
d->FloatingWidget->moveFloating();
if (d->DockWidget->features() & CDockWidget::DockWidgetMovable) {
d->FloatingWidget->moveFloating();
}
QFrame::mouseMoveEvent(ev);
return;
}
@ -283,19 +288,25 @@ void CDockWidgetTitleBar::mouseMoveEvent(QMouseEvent* ev)
// move tab
if (d->isDraggingState(DraggingTab))
{
d->moveTab(ev);
if (d->DockWidget->features() & CDockWidget::DockWidgetMovable) {
d->moveTab(ev);
}
}
bool MouseInsideTitleArea = d->titleAreaGeometryContains(ev->globalPos());
if (!MouseInsideTitleArea)
{
d->startFloating();
if (d->DockWidget->features() & CDockWidget::DockWidgetMovable) {
d->startFloating();
}
return;
}
else if (d->DockArea->count() > 1
&& (ev->pos() - d->DragStartMousePosition).manhattanLength() >= QApplication::startDragDistance()) // Wait a few pixels before start moving
{
d->DragState = DraggingTab;
if (d->DockWidget->features() & CDockWidget::DockWidgetMovable) {
d->DragState = DraggingTab;
}
return;
}