mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-26 08:01:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

DockWidgetMovable feature implemented

Browse Source 
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
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/DockWidgetTitleBar.cpp
View File

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