diff options
| author | Daniel Nicoletti <dantti12@gmail.com> | 2014-04-29 16:04:21 -0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-11 12:34:52 +0200 |
| commit | 98dca3b54f52f08117c1e0d3a1b4826ed12ef23f (patch) | |
| tree | c820ebfc64e0b935342e320e1ec076613447551e | |
| parent | f9ebbd6c618488f9b671f5504528ced3350754fb (diff) | |
| download | qtwayland-5.3.tar.gz | |
Fix popup positioningstablebaserock/v5.3.05.3
The popup coordinates were being stored in an
unused variable and x,y offsets were left unmodified
Change-Id: Idbae7127b65963be6ddbe165d98ac7daa92cac9f
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlshellsurface.cpp | 4 | ||||
| -rw-r--r-- | src/compositor/wayland_wrapper/qwlshellsurface_p.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/compositor/wayland_wrapper/qwlshellsurface.cpp b/src/compositor/wayland_wrapper/qwlshellsurface.cpp index 8762d365..8fb35a66 100644 --- a/src/compositor/wayland_wrapper/qwlshellsurface.cpp +++ b/src/compositor/wayland_wrapper/qwlshellsurface.cpp @@ -99,7 +99,6 @@ ShellSurface::ShellSurface(Shell *shell, wl_client *client, uint32_t id, Surface , m_xOffset(0) , m_yOffset(0) , m_windowType(QWaylandSurface::None) - , m_popupLocation() , m_popupSerial() { surface->setShellSurface(this); @@ -309,7 +308,8 @@ void ShellSurface::shell_surface_set_popup(Resource *resource, wl_resource *inpu m_popupSerial = serial; m_transientParent = Surface::fromResource(parent)->shellSurface(); - m_popupLocation = QPointF(x, y); + m_xOffset = x; + m_yOffset = y; if (m_windowType != QWaylandSurface::Popup) { m_windowType = QWaylandSurface::Popup; diff --git a/src/compositor/wayland_wrapper/qwlshellsurface_p.h b/src/compositor/wayland_wrapper/qwlshellsurface_p.h index 18ecdabb..fd115852 100644 --- a/src/compositor/wayland_wrapper/qwlshellsurface_p.h +++ b/src/compositor/wayland_wrapper/qwlshellsurface_p.h @@ -118,7 +118,6 @@ private: QWaylandSurface::WindowType m_windowType; - QPointF m_popupLocation; uint32_t m_popupSerial; QSet<uint32_t> m_pings; |