Skip to content

Preserve dock parents to avoid black QOpenGLWidget views #871

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
kriben wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve dock parents to avoid black QOpenGLWidget views #871

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
11 changes: 6 additions & 5 deletions src/DockAreaWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ static bool isAutoHideFeatureEnabled()
/**
* Internal dock area layout mimics stack layout but only inserts the current
* widget into the internal QLayout object.
* \warning Only the current widget has a parent. All other widgets
* do not have a parent. That means, a widget that is in this layout may
* return nullptr for its parent() function if it is not the current widget.
* Inactive widgets are hidden and parented to the dock manager when available,
* rather than becoming temporary top-level windows.
*/
class CDockAreaLayout
{
Expand All @@ -85,12 +84,14 @@ class CDockAreaLayout
QWidget* m_CurrentWidget = nullptr;

/**
* Detaches a widget without turning an existing native window into a top-level window.
* Detaches a widget while keeping it hidden and parented to the dock manager.
*/
void detachWidget(QWidget* Widget)
{
// setParent() may be a no-op; keep inactive docks hidden explicitly.
Widget->hide();
CDockAreaWidget* DockArea = qobject_cast<CDockAreaWidget*>(m_ParentLayout->parentWidget());
if (Widget->internalWinId() && DockArea && DockArea->dockManager())
if (DockArea && DockArea->dockManager())
{
Widget->setParent(DockArea->dockManager());
}
Expand Down