diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-10 13:28:10 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-17 10:49:31 +0000 |
| commit | 41bb5f362e49cc68b85022b749aaf654fa5c55bf (patch) | |
| tree | 2fbe8e2f516ab3960b035b204f7559a58eb7dc10 /src/plugins/platforms/xcb | |
| parent | 56952436f40e573008b1223a52da1a3abe9642ff (diff) | |
Make drag and drop work again after the merge
QBasicDrag does not have enough information to map the
coordinates, so we move that responsibility to the plugin.
Change-Id: I6eb87014b3259844bb3373ecf961d92debdb2b84
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbdrag.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbdrag.cpp b/src/plugins/platforms/xcb/qxcbdrag.cpp index 8d4878e12e..7cd9cafa8e 100644 --- a/src/plugins/platforms/xcb/qxcbdrag.cpp +++ b/src/plugins/platforms/xcb/qxcbdrag.cpp @@ -51,6 +51,7 @@ #include <private/qshapedpixmapdndwindow_p.h> #include <private/qsimpledrag_p.h> +#include <private/qhighdpiscaling_p.h> QT_BEGIN_NAMESPACE @@ -303,7 +304,6 @@ xcb_window_t QXcbDrag::findRealWindow(const QPoint & pos, xcb_window_t w, int md void QXcbDrag::move(const QPoint &globalPos) { - QBasicDrag::move(globalPos); if (source_sameanswer.contains(globalPos) && source_sameanswer.isValid()) return; @@ -316,6 +316,9 @@ void QXcbDrag::move(const QPoint &globalPos) break; } } + + QBasicDrag::moveShapedPixmapWindow(QHighDpiScaling::mapPositionFromNative(globalPos, screen)); + if (screen != current_screen) { // ### need to recreate the shaped pixmap window? // int screen = QCursor::x11Screen(); |