diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 10:47:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-28 12:24:42 +0200 |
| commit | 6169341cbbeebdd6deed7c012b2ba79e1f6d95ff (patch) | |
| tree | dd3dd688eabf504913df465bb1a384521fcafda4 /src/client/qwaylandwlshellsurface.cpp | |
| parent | 87499ddd653fb20796c2dd2eabac37b45240ef1c (diff) | |
| parent | 3dc9cfdbd2771c28c770d432b99e571db43fe599 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1
Conflicts:
src/client/qwaylandwindow.cpp
Change-Id: I80ead87f3e1f36299b1bf9cc9c7db6cd48c0e86f
Diffstat (limited to 'src/client/qwaylandwlshellsurface.cpp')
| -rw-r--r-- | src/client/qwaylandwlshellsurface.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/client/qwaylandwlshellsurface.cpp b/src/client/qwaylandwlshellsurface.cpp index 8888dbf4d..f7bdc2c99 100644 --- a/src/client/qwaylandwlshellsurface.cpp +++ b/src/client/qwaylandwlshellsurface.cpp @@ -159,8 +159,7 @@ void QWaylandWlShellSurface::updateTransientParent(QWindow *parent) // set_transient expects a position relative to the parent QPoint transientPos = m_window->geometry().topLeft(); // this is absolute - QWindow *parentWin = m_window->window()->transientParent(); - transientPos -= parentWin->geometry().topLeft(); + transientPos -= parent->geometry().topLeft(); if (parent_wayland_window->decoration()) { transientPos.setX(transientPos.x() + parent_wayland_window->decoration()->margins().left()); transientPos.setY(transientPos.y() + parent_wayland_window->decoration()->margins().top()); |