diff options
| author | Błażej Szczygieł <spaz16@wp.pl> | 2016-02-15 20:50:16 +0100 |
|---|---|---|
| committer | Błażej Szczygieł <spaz16@wp.pl> | 2016-02-18 20:08:07 +0000 |
| commit | 78ad8f208d8dbe3575194bb9b97d4e42efdc32d5 (patch) | |
| tree | db2907d4b7ac163d5a140868c85767572f6a2560 /src/gui/kernel/qsimpledrag_p.h | |
| parent | 4889269ff0fb37130b332863e82dd7c19564116c (diff) | |
xcb: Fix drag and drop between xcb screens
Set the proper screen before creating a shaped pixmap window in
QBasicDrag::startDrag(). Grab mouse again when D&D window is
recreated.
Task-number: QTBUG-51215
Change-Id: I5cb47d3b11672b56d17b32072d84a722bdcdcd9a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qsimpledrag_p.h')
| -rw-r--r-- | src/gui/kernel/qsimpledrag_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h index 055136c436..b208c8ccc9 100644 --- a/src/gui/kernel/qsimpledrag_p.h +++ b/src/gui/kernel/qsimpledrag_p.h @@ -90,6 +90,8 @@ protected: bool useCompositing() const { return m_useCompositing; } void setUseCompositing(bool on) { m_useCompositing = on; } + void setScreen(QScreen *screen) { m_screen = screen; } + Qt::DropAction executedDropAction() const { return m_executed_drop_action; } void setExecutedDropAction(Qt::DropAction da) { m_executed_drop_action = da; } @@ -108,6 +110,7 @@ private: QDrag *m_drag; QShapedPixmapWindow *m_drag_icon_window; bool m_useCompositing; + QScreen *m_screen; }; class Q_GUI_EXPORT QSimpleDrag : public QBasicDrag |