diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-12-03 16:40:27 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2018-12-14 14:30:32 +0100 |
| commit | bb7bf732bae1e2f4ebf0ed4e0307dbd63dade1d0 (patch) | |
| tree | 07c199313b15fc764af5eb92833f679b619bf537 /vcl/qt5/Qt5Widget.cxx | |
| parent | 1a8cb9df631d820ed488cb6faafacbbf11a3f913 (diff) | |
tdf#120775: Implement DnD between 2 SalFrames
still only internal DnD (between multiple frames within 1 LibO
instance) is supported
Change-Id: I151162ee1075c8b2d71520aae950fc7214d752b7
Reviewed-on: https://gerrit.libreoffice.org/64477
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
(cherry picked from commit f67e9aeeb1bd6fe82e0c4e851017962c74723213)
Reviewed-on: https://gerrit.libreoffice.org/65152
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/qt5/Qt5Widget.cxx')
| -rw-r--r-- | vcl/qt5/Qt5Widget.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx index ea0258589ff7..2d108fa21cd5 100644 --- a/vcl/qt5/Qt5Widget.cxx +++ b/vcl/qt5/Qt5Widget.cxx @@ -187,8 +187,9 @@ void Qt5Widget::wheelEvent(QWheelEvent* pEvent) void Qt5Widget::startDrag() { + // internal drag source QMimeData* mimeData = new QMimeData; - mimeData->setData("application/x-libreoffice-dnditem", nullptr); + mimeData->setData(m_InternalMimeType, nullptr); QDrag* drag = new QDrag(this); drag->setMimeData(mimeData); @@ -197,8 +198,9 @@ void Qt5Widget::startDrag() void Qt5Widget::dragEnterEvent(QDragEnterEvent* event) { - if (event->source() == this) + if (event->mimeData()->hasFormat(m_InternalMimeType)) event->accept(); + // else FIXME: external drag source } void Qt5Widget::dragMoveEvent(QDragMoveEvent* event) |