Skip to content

Wayland: render drag preview and overlays as child widgets instead of top-level Qt::Tool #837

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
facontidavide wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −36
Open

Wayland: render drag preview and overlays as child widgets instead of top-level Qt::Tool #837

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
43 changes: 19 additions & 24 deletions src/DockOverlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,21 +397,20 @@ int DockOverlayPrivate::sideBarMouseZone(SideBarLocation sideBarLocation)


//============================================================================
// Wayland: parent the overlay to the manager's top-level window and drop
// the Qt::Tool flags. Top-level placement in screen coordinates is unreliable
// under Wayland, which left the indicators stuck over the wrong dock area.
CDockOverlay::CDockOverlay(QWidget* parent, eMode Mode) :
QFrame(parent),
QFrame(parent ? parent->window() : nullptr),
d(new DockOverlayPrivate(this))
{
d->Mode = Mode;
d->Cross = new CDockOverlayCross(this);
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
#else
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
#endif
setWindowOpacity(1);
setWindowTitle("DockOverlay");
setAttribute(Qt::WA_NoSystemBackground);
setAttribute(Qt::WA_TranslucentBackground);
setAttribute(Qt::WA_TransparentForMouseEvents);

d->Cross->setVisible(false);
setVisible(false);
Expand Down Expand Up @@ -570,9 +569,10 @@ DockWidgetArea CDockOverlay::showOverlay(QWidget* target)
// Move it over the target.
hide();
resize(target->size());
QPoint TopLeft = target->mapToGlobal(target->rect().topLeft());
move(TopLeft);
const QPoint TopLeftGlobal = target->mapToGlobal(target->rect().topLeft());
move(parentWidget() ? parentWidget()->mapFromGlobal(TopLeftGlobal) : TopLeftGlobal);
show();
raise();
d->Cross->updatePosition();
d->Cross->updateOverlayIcons();
return dropAreaUnderCursor();
Expand Down Expand Up @@ -733,18 +733,15 @@ QPoint DockOverlayCrossPrivate::areaGridPosition(const DockWidgetArea area)


//============================================================================
// Wayland: see CDockOverlay above for the rationale.
CDockOverlayCross::CDockOverlayCross(CDockOverlay* overlay) :
QWidget(overlay->parentWidget()),
QWidget(overlay->parentWidget() ? overlay->parentWidget()->window() : nullptr),
d(new DockOverlayCrossPrivate(this))
{
d->DockOverlay = overlay;
#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
#else
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
#endif
setWindowTitle("DockOverlayCross");
setAttribute(Qt::WA_TranslucentBackground);
setAttribute(Qt::WA_TransparentForMouseEvents);

d->GridLayout = new QGridLayout();
d->GridLayout->setSpacing(0);
Expand Down Expand Up @@ -784,7 +781,10 @@ void CDockOverlayCross::setupOverlayCross(CDockOverlay::eMode Mode)
//============================================================================
void CDockOverlayCross::updateOverlayIcons()
{
if (windowHandle()->devicePixelRatio() == d->LastDevicePixelRatio)
// Wayland: devicePixelRatioF() walks the parent chain; the original
// windowHandle()->devicePixelRatio() segfaults for a child widget.
const qreal CurrentRatio = devicePixelRatioF();
if (CurrentRatio == d->LastDevicePixelRatio)
{
return;
}
Expand All @@ -793,11 +793,7 @@ void CDockOverlayCross::updateOverlayIcons()
{
d->updateDropIndicatorIcon(Widget);
}
#if QT_VERSION >= 0x050600
d->LastDevicePixelRatio = devicePixelRatioF();
#else
d->LastDevicePixelRatio = devicePixelRatio();
#endif
d->LastDevicePixelRatio = CurrentRatio;
}


Expand Down Expand Up @@ -911,11 +907,10 @@ void CDockOverlayCross::showEvent(QShowEvent*)
void CDockOverlayCross::updatePosition()
{
resize(d->DockOverlay->size());
QPoint TopLeft = d->DockOverlay->pos();
QPoint Offest((this->width() - d->DockOverlay->width()) / 2,
const QPoint Offset((this->width() - d->DockOverlay->width()) / 2,
(this->height() - d->DockOverlay->height()) / 2);
QPoint CrossTopLeft = TopLeft - Offest;
move(CrossTopLeft);
move(d->DockOverlay->pos() - Offset);
raise();
}


Expand Down
41 changes: 29 additions & 12 deletions src/FloatingDragPreview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,14 @@ void FloatingDragPreviewPrivate::createFloatingWidget()


//============================================================================
// Wayland: in the frameless config, parent the preview to the manager's
// top-level window so it renders as a translucent child instead of a Qt::Tool
// top-level. Wayland refuses to honour client-driven move() of top-levels in
// screen coordinates; child widgets work on every backend.
CFloatingDragPreview::CFloatingDragPreview(QWidget* Content, QWidget* parent) :
QWidget(parent),
QWidget((parent && !CDockManager::testConfigFlag(CDockManager::DragPreviewHasWindowFrame))
? parent->window()
: parent),
d(new FloatingDragPreviewPrivate(this))
{
d->Content = Content;
Expand All @@ -287,20 +293,21 @@ CFloatingDragPreview::CFloatingDragPreview(QWidget* Content, QWidget* parent) :
{
setWindowFlags(
Qt::Window | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint);

#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
auto Flags = windowFlags();
Flags |= Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint;
setWindowFlags(Flags);
#endif
}
else
{
setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
setAttribute(Qt::WA_NoSystemBackground);
setAttribute(Qt::WA_TranslucentBackground);
// Let releases over visible drop indicators fall through to them.
setAttribute(Qt::WA_TransparentForMouseEvents);
}

#if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS)
auto Flags = windowFlags();
Flags |= Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint;
setWindowFlags(Flags);
#endif

// Create a static image of the widget that should get undocked
// This is like some kind preview image like it is uses in drag and drop
// operations
Expand Down Expand Up @@ -352,10 +359,20 @@ CFloatingDragPreview::~CFloatingDragPreview()
//============================================================================
void CFloatingDragPreview::moveFloating()
{
int BorderSize = (frameSize().width() - size().width()) / 2;
const QPoint moveToPos = QCursor::pos() - d->DragStartMousePosition
const int BorderSize = (frameSize().width() - size().width()) / 2;
const QPoint TargetGlobal = QCursor::pos() - d->DragStartMousePosition
- QPoint(BorderSize, 0);
move(moveToPos);
// Wayland: when we're a child widget (frameless config), translate
// the screen-coord target into parent-local space so move() actually
// places us under the cursor.
if (isWindow() || !parentWidget())
{
move(TargetGlobal);
}
else
{
move(parentWidget()->mapFromGlobal(TargetGlobal));
}
d->updateDropOverlays(QCursor::pos());
}

Expand All @@ -370,7 +387,7 @@ void CFloatingDragPreview::startFloating(const QPoint &DragStartMousePos,
d->DragStartMousePosition = DragStartMousePos;
moveFloating();
show();

raise();
}


Expand Down