1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compensate for window decoration size in data_device_enter/motion.

Browse Source 
Change-Id: I71a549e597ec0821c778edca9f8cb20eefdcc75e
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
This commit is contained in:
Erik Larsson 2016-04-17 20:24:01 +02:00
parent 0654dbd90c
commit e347632447
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/platforms/wayland/qwaylanddatadevice.cpp
View File

@ -46,6 +46,7 @@
#include "qwaylanddnd_p.h" #include "qwaylanddnd_p.h"
#include "qwaylandinputdevice_p.h" #include "qwaylandinputdevice_p.h"
#include "qwaylanddisplay_p.h" #include "qwaylanddisplay_p.h"
#include "qwaylandabstractdecoration_p.h"
#include <QtCore/QMimeData> #include <QtCore/QMimeData>
#include <QtGui/QGuiApplication> #include <QtGui/QGuiApplication>
@ -153,7 +154,7 @@ void QWaylandDataDevice::data_device_enter(uint32_t serial, wl_surface *surface,
{ {
m_enterSerial = serial; m_enterSerial = serial;
m_dragWindow = QWaylandWindow::fromWlSurface(surface)->window(); m_dragWindow = QWaylandWindow::fromWlSurface(surface)->window();
m_dragPoint = QPoint(wl_fixed_to_int(x), wl_fixed_to_int(y)); m_dragPoint = calculateDragPosition(x, y, m_dragWindow);
QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag(); QDrag *drag = static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->currentDrag();
@ -202,7 +203,7 @@ void QWaylandDataDevice::data_device_motion(uint32_t time, wl_fixed_t x, wl_fixe
if (!drag && !m_dragOffer) if (!drag && !m_dragOffer)
return; return;
m_dragPoint = QPoint(wl_fixed_to_int(x), wl_fixed_to_int(y)); m_dragPoint = calculateDragPosition(x, y, m_dragWindow);
QMimeData *dragData; QMimeData *dragData;
Qt::DropActions supportedActions; Qt::DropActions supportedActions;
@ -246,7 +247,6 @@ void QWaylandDataDevice::selectionSourceCancelled()
void QWaylandDataDevice::dragSourceCancelled() void QWaylandDataDevice::dragSourceCancelled()
{ {
m_dragSource.reset(); m_dragSource.reset();
} }
void QWaylandDataDevice::dragSourceTargetChanged(const QString &mimeType) void QWaylandDataDevice::dragSourceTargetChanged(const QString &mimeType)
@ -254,6 +254,19 @@ void QWaylandDataDevice::dragSourceTargetChanged(const QString &mimeType)
static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->updateTarget(mimeType); static_cast<QWaylandDrag *>(QGuiApplicationPrivate::platformIntegration()->drag())->updateTarget(mimeType);
} }
QPoint QWaylandDataDevice::calculateDragPosition(int x, int y, QWindow *wnd) const
{
QPoint pnt(wl_fixed_to_int(x), wl_fixed_to_int(y));
if (wnd) {
QWaylandWindow *wwnd = static_cast<QWaylandWindow*>(m_dragWindow->handle());
if (wwnd && wwnd->decoration()) {
pnt -= QPoint(wwnd->decoration()->margins().left(),
wwnd->decoration()->margins().top());
}
}
return pnt;
}
} }
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/plugins/platforms/wayland/qwaylanddatadevice_p.h
View File

@ -101,6 +101,8 @@ private Q_SLOTS:
void dragSourceTargetChanged(const QString &mimeType); void dragSourceTargetChanged(const QString &mimeType);
private: private:
QPoint calculateDragPosition(int x, int y, QWindow *wnd) const;
QWaylandDisplay *m_display; QWaylandDisplay *m_display;
QWaylandInputDevice *m_inputDevice; QWaylandInputDevice *m_inputDevice;
uint32_t m_enterSerial; uint32_t m_enterSerial;