Skip to content

Allow moving single dock widget by dragging its tab #863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ZFail wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −23
Open

Allow moving single dock widget by dragging its tab #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 5 additions & 23 deletions src/DockWidgetTab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,17 +312,14 @@ bool DockWidgetTabPrivate::startFloating(eDragState DraggingState)
ADS_PRINT("isFloating " << dockContainer->isFloating());
ADS_PRINT("areaCount " << dockContainer->dockAreaCount());
ADS_PRINT("widgetCount " << DockWidget->dockAreaWidget()->dockWidgetsCount());
// if this is the last dock widget inside of this floating widget,
// then it does not make any sense, to make it floating because
// it is already floating
if (dockContainer->isFloating()
// On Wayland, dragging the tab of the single dock widget of a
// floating widget drags the existing floating widget, so the user
// can dock it into another container
if (internal::isWayland() && dockContainer->isFloating()
&& (dockContainer->visibleDockAreaCount() == 1)
&& (DockWidget->dockAreaWidget()->dockWidgetsCount() == 1))
{
// On Wayland, dragging the tab of the single dock widget of a
// floating widget drags the existing floating widget, so the user
// can dock it into another container
if (internal::isWayland() && (DraggingFloatingWidget == DraggingState))
if (DraggingFloatingWidget == DraggingState)
{
auto FloatingContainer = dockContainer->floatingWidget();
if (FloatingContainer)
Expand Down Expand Up @@ -557,21 +554,6 @@ void CDockWidgetTab::mouseMoveEvent(QMouseEvent* ev)
int DragDistanceY = qAbs(d->GlobalDragStartMousePosition.y() - internal::globalPositionOf(ev).y());
if (DragDistanceY >= CDockManager::startDragDistance() || MouseOutsideBar)
{
// If this is the last dock area in a dock container with only
// one single dock widget it does not make sense to move it to a new
// floating widget and leave this one empty.
// On Wayland we fall through, because dragging the tab drags the
// existing floating widget so the user can dock it into another
// container
if (d->DockArea->dockContainer()->isFloating()
&& d->DockArea->openDockWidgetsCount() == 1
&& d->DockArea->dockContainer()->visibleDockAreaCount() == 1
&& !internal::isWayland())
{
return;
}


// Floating is only allowed for widgets that are floatable
// We can create the drag preview if the widget is movable.
auto Features = d->DockWidget->features();
Expand Down
5 changes: 5 additions & 0 deletions src/FloatingDockContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,11 @@ void CFloatingDockContainer::onDockAreasAddedOrRemoved()
d->setWindowTitle(d->floatingContainersTitle());
setWindowIcon(QApplication::windowIcon());
}

if (d->DockContainer->dockAreaCount() == 0)
{
deleteLater();
}
}

//============================================================================
Expand Down