QmlDesigner: Remove custom drag and drop code

Change-Id: I97d94003aef76d014486ff29d0e8f78689f7558f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

src/plugins/qmldesigner/components/formeditor/dragtool.cpp

@@ -31,7 +31,6 @@
 
 #include "formeditorscene.h"
 #include "formeditorview.h"
-#include <customdraganddrop.h>
 #include <metainfo.h>
 #include <rewritingexception.h>
 
@@ -39,6 +38,7 @@
 #include <QDebug>
 #include <QMimeData>
 #include <QTimer>
+#include <QWidget>
 
 namespace QmlDesigner {
 
@@ -217,7 +217,6 @@ void DragTool::instancesCompleted(const QList<FormEditorItem*> &itemList)
     foreach (FormEditorItem* item, itemList)
         if (item->qmlItemNode() == m_dragNode)
             clearMoveDelay();
-    QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::hide();
 }
 
 void DragTool::instancesParentChanged(const QList<FormEditorItem *> &itemList)
@@ -247,8 +246,6 @@ void DragTool::abort()
 
     if (m_dragNode.isValid())
         m_dragNode.destroy();
-
-    QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::hide();
 }
 
 void DragTool::commitTransaction()
@@ -321,7 +318,6 @@ void DragTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * event)
 
         commitTransaction();
 
-        QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::show();
         QList<QmlItemNode> nodeList;
         view()->setSelectedModelNodes(toModelNodeList(nodeList));
         view()->changeToSelectionTool();
@@ -337,8 +333,7 @@ void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event)
         event->ignore();
         return;
     }
-    if (QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::isAnimated())
+
-        return;
     if (event->mimeData()->hasFormat("application/vnd.bauhaus.itemlibraryinfo") ||
        event->mimeData()->hasFormat("application/vnd.bauhaus.libraryresource")) {
         event->accept();
@@ -348,7 +343,6 @@ void DragTool::dragMoveEvent(QGraphicsSceneDragDropEvent * event)
             FormEditorItem *parentItem = calculateContainer(event->scenePos() + QPoint(2, 2));
             if (!parentItem) {      //if there is no parent any more - the use left the scene
                 end();
-                QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::show();
                 m_dragNode.destroy(); //delete the node then
                 return;
             }

src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.cpp

@@ -1,315 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#include "customdraganddrop.h"
-
-#include <QMimeData>
-#include <QPoint>
-
-#include <QMouseEvent>
-#include <QApplication>
-#include <QDebug>
-#include <QPainter>
-
-#if defined(Q_OS_WIN) && QT_VERSION < 0x050000
-#include <private/qwidget_p.h>
-#endif
-
-namespace QmlDesigner {
-
-namespace QmlDesignerItemLibraryDragAndDrop {
-
-void CustomDragAndDropIcon::startDrag()
-{
-    m_size = m_icon.size();
-    m_iconAlpha = 1;
-    m_previewAlpha = 0;
-
-    QPoint pos = QCursor::pos();
-    QWidget *widget = QApplication::topLevelAt(pos);
-    setParent(widget);
-    raise();
-    show();
-
-    grabMouseSafely();
-}
-
-void CustomDragAndDropIcon::grabMouseSafely()
-{
-#if defined(Q_OS_WIN) && QT_VERSION < 0x050000
-    // grabMouse calls SetWindowsHookEx() - this function causes a system-wide
-    // freeze if any other app on the system installs a hook and fails to
-    // process events.
-    QWidgetPrivate *p = qt_widget_private(this);
-    p->grabMouseWhileInWindow();
-#else
-    grabMouse();
-#endif
-}
-
-void CustomDragAndDropIcon::mouseReleaseEvent(QMouseEvent *event)
-{
-     QPoint globalPos = event->globalPos();
-     releaseMouse();
-     move(-1000, -1000); //-1000, -1000 is used to hide because hiding causes propblems with the mouse grabber
-     QWidget* target = QApplication::widgetAt(globalPos - QPoint(2,2)); //-(2, 2) because:
-                                                                        // otherwise we just get this widget
-
-     if (CustomDragAndDrop::isAccepted()) // if the target widget accepted the enter event,
-                                          // then create a drop event
-         CustomDragAndDrop::drop(target, globalPos);
-     CustomDragAndDrop::endCustomDrag();
-}
-
-void CustomDragAndDropIcon::mouseMoveEvent(QMouseEvent *event)
-{
-    QPoint globalPos = event->globalPos();
-    QWidget * widget = QApplication::topLevelAt(globalPos); // grap the "current" top level widget
-    if (widget) {
-        setParent(widget); // set the current top level widget as parent
-        QPoint pos = parentWidget()->mapFromGlobal(globalPos);
-        if ((pos.y() > 30 && CustomDragAndDrop::isVisible())) // do not allow dragging over the menubar
-            move(pos);
-        else
-            move(-1000, -1000); // no hiding because of mouse grabbing
-        resize(m_size);
-        show();
-        update();
-    } else {
-       move(-1000, -1000); // if no top level widget is found we are out of the main window
-    }
-    QWidget* target = QApplication::widgetAt(globalPos - QPoint(2,2)); //-(2, 2) because:
-                                                                       // otherwise we just get this widget
-    if (target != m_oldTarget) {
-      if (CustomDragAndDrop::isAccepted())
-        CustomDragAndDrop::leave(m_oldTarget, globalPos);  // create DragLeave event if drag enter
-                                                           // event was accepted
-      bool wasAccepted = CustomDragAndDrop::isAccepted();
-      CustomDragAndDrop::enter(target, globalPos);         // create and handle the create enter event
-      releaseMouse(); // to set the cursor we have to disable the mouse grabber
-      if (CustomDragAndDrop::isAccepted()) { // setting the right cursor and trigger animation
-          setCursor(Qt::CrossCursor);
-          if (!wasAccepted)
-              enter();                      // trigger animation if enter event was accepted
-      } else {
-          setCursor(Qt::ForbiddenCursor);
-          if (wasAccepted)
-              leave();                     // trigger animation if we leave a widget that accepted
-                                           // the drag enter event
-      }
-      // enable the mouse grabber again - after the curser is set
-      grabMouseSafely();
-    } else {
-        if (CustomDragAndDrop::isAccepted()) // create DragMoveEvents if the current widget
-                                             // accepted the DragEnter event
-            CustomDragAndDrop::move(target, globalPos);
-    }
-    m_oldTarget = target;
-}
-
-void CustomDragAndDropIcon::paintEvent(QPaintEvent *event)
-{
-    QWidget::paintEvent(event);
-    QPainter p(this);
-    if  (CustomDragAndDrop::isAccepted()) {
-        p.setOpacity(m_previewAlpha);
-        p.drawPixmap(0 ,0 , m_size.width(), m_size.height(), m_preview);
-        p.setOpacity(m_iconAlpha);
-        p.drawPixmap(0, 0, m_size.width(), m_size.height(), m_icon);
-    } else {
-        p.setOpacity(m_iconAlpha);
-        p.drawPixmap(0, 0, m_size.width(), m_size.height(), m_icon);
-        p.setOpacity(m_previewAlpha);
-        p.drawPixmap(0 ,0 , m_size.width(), m_size.height(), m_preview);
-    }
-}
-
-void CustomDragAndDropIcon::enter()
-{
-    connect(&m_timeLine, SIGNAL(frameChanged(int)), this, SLOT(animateDrag(int)));
-    m_timeLine.setFrameRange(0, 10);
-    m_timeLine.setDuration(10);
-    m_timeLine.setLoopCount(1);
-    m_timeLine.setCurveShape(QTimeLine::EaseInCurve);
-    m_timeLine.start();
-    m_size  = m_icon.size();
-    m_iconAlpha = 1;
-    m_previewAlpha = 0;
-}
-
-void CustomDragAndDropIcon::leave()
-{
-    connect(&m_timeLine, SIGNAL(frameChanged(int)), this, SLOT(animateDrag(int)));
-    m_timeLine.setFrameRange(0, 10);
-    m_timeLine.setDuration(250);
-    m_timeLine.setLoopCount(1);
-    m_timeLine.setCurveShape(QTimeLine::EaseInCurve);
-    m_timeLine.start();
-    m_size  = m_preview.size();
-    m_iconAlpha = 0;
-    m_previewAlpha = 1;
-}
-
-void CustomDragAndDropIcon::animateDrag(int frame)
-{
-    // interpolation of m_size and alpha values
-    if (CustomDragAndDrop::isAccepted()) {
-        // small -> big
-        m_iconAlpha = 1.0 - qreal(frame) / 10.0;
-        m_previewAlpha = qreal(frame) / 10.0;
-        int width = qreal(m_preview.width()) * (qreal(frame) / 10.0) + qreal(m_icon.width()) * (1.0 - qreal(frame) / 10.0);
-        int height = qreal(m_preview.height()) * (qreal(frame) / 10.0) + qreal(m_icon.height()) * (1 - qreal(frame) / 10.0);
-        m_size = QSize(width, height);
-    } else {
-        // big -> small
-        m_previewAlpha = 1.0 - qreal(frame) / 10.0;
-        m_iconAlpha = qreal(frame) / 10.0;
-        int width = qreal(m_icon.width()) * (qreal(frame) / 10.0) + qreal(m_preview.width()) * (1.0 - qreal(frame) / 10.0);
-        int height = qreal(m_icon.height()) * (qreal(frame) / 10.0) + qreal(m_preview.height()) * (1 - qreal(frame) / 10.0);
-        m_size = QSize(width, height);
-    }
-    QPoint p = pos();
-    resize(m_size);
-    move(p);
-    update(); // redrawing needed
-}
-
-
-class CustomDragAndDropGuard { // This guard destroys the singleton in its destructor
-public:                   // This should avoid that a memory leak is reported
-    ~CustomDragAndDropGuard() {
-        if (CustomDragAndDrop::m_instance)
-            delete CustomDragAndDrop::m_instance;
-    }
-};
-
-
-CustomDragAndDrop* CustomDragAndDrop::m_instance = 0;
-
-CustomDragAndDrop::CustomDragAndDrop() : m_customDragActive(0), m_mimeData(0), m_accepted(false)
-{
-    m_widget = new CustomDragAndDropIcon(QApplication::topLevelWidgets().first());
-    m_widget->move(-1000, 1000);
-    m_widget->resize(32, 32);
-    m_widget->show();
-}
-
-
-CustomDragAndDrop* CustomDragAndDrop::instance()
-{
-    static CustomDragAndDropGuard guard; // The destructor destroys the singleton. See above
-    if (m_instance == 0)
-        m_instance = new CustomDragAndDrop();
-    return m_instance;
-}
-
-void CustomDragAndDrop::endCustomDrag()
-{
-    instance()->m_customDragActive = false;
-}
-
-void CustomDragAndDrop::startCustomDrag(const QPixmap icon, const QPixmap preview, QMimeData * mimeData)
-{
-    if (instance()->m_customDragActive) {
-        qWarning("CustomDragAndDrop::startCustomDrag drag is active");
-        return ;
-    }
-    instance()->m_customDragActive = true;
-    instance()-> m_accepted = false;
-    show();
-    instance()->m_mimeData = mimeData;
-    instance()->m_widget->setIcon(icon);
-    instance()->m_widget->setPreview(preview);
-    instance()->m_widget->startDrag();
-}
-
-bool CustomDragAndDrop::customDragActive()
-{
-    return instance()->m_customDragActive;
-}
-
-bool CustomDragAndDrop::isAccepted()
-{
-    return instance()->m_accepted;
-}
-
-void CustomDragAndDrop::enter(QWidget *target, QPoint globalPos)
-{
-    if (target) {
-        QPoint pos = target->mapFromGlobal(globalPos);
-        QDragEnterEvent event(pos, Qt::MoveAction, instance()->m_mimeData ,Qt::RightButton, Qt::NoModifier);
-        QApplication::sendEvent(target, &event);
-        instance()-> m_accepted = event.isAccepted(); // if the event is accepted we enter the "accepted" state
-    } else {
-        instance()-> m_accepted = false;
-    }
-}
-
-void CustomDragAndDrop::leave(QWidget *target, QPoint globalPos)
-{
-    Q_UNUSED(globalPos)
-    if (target) {
-        QDragLeaveEvent event;
-        QApplication::sendEvent(target, &event);
-    } else {
-       qWarning() <<  "CustomDragAndDrop::leave leaving invalid target";
-    }
-}
-
-void CustomDragAndDrop::move(QWidget *target, QPoint globalPos)
-{
-    if (target) {
-        QPoint pos = target->mapFromGlobal(globalPos);
-        QDragMoveEvent event(pos, Qt::MoveAction, instance()->m_mimeData ,Qt::RightButton, Qt::NoModifier);
-        QApplication::sendEvent(target, &event);
-    } else {
-        qWarning() <<  "CustomDragAndDrop::move move in invalid target";
-    }
-}
-
-void CustomDragAndDrop::drop(QWidget *target, QPoint globalPos)
-{
-    if (target) {
-        QPoint pos = target->mapFromGlobal(globalPos);
-        QDropEvent event(pos, Qt::MoveAction, instance()->m_mimeData ,Qt::RightButton, Qt::NoModifier);
-        QApplication::sendEvent(target, &event);
-    } else {
-        qWarning() <<  "CustomDragAndDrop::drop dropping in invalid target";
-    }
-}
-
-bool CustomDragAndDrop::isAnimated()
-{
-    if (instance()->m_widget)
-        return instance()->m_widget->isAnimated();
-    return false;
-}
-
-} // namespace QmlDesignerItemLibraryDragAndDrop
-} // namespave QmlDesigner

src/plugins/qmldesigner/components/itemlibrary/customdraganddrop.h

@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of Qt Creator.
-**
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-****************************************************************************/
-
-#ifndef CUSTOMDRAGANDDROP_H
-#define CUSTOMDRAGANDDROP_H
-
-#include <QPixmap>
-#include <QLabel>
-#include <QTimeLine>
-#include <QDrag>
-
-QT_BEGIN_NAMESPACE
-class QMimeData;
-QT_END_NAMESPACE
-
-namespace QmlDesigner {
-
-namespace QmlDesignerItemLibraryDragAndDrop {
-
-class CustomDragAndDropIcon : public QLabel { //this class shows the icon for the drag drop operation
-    Q_OBJECT
-public:
-    CustomDragAndDropIcon(QWidget *parent = 0) : QLabel(parent), m_oldTarget(0)
-    {
-    }
-    void setPreview(const QPixmap &pixmap)
-    { m_preview = pixmap; }
-    void setIcon(const QPixmap &pixmap)
-    { m_icon = pixmap; }
-
-    void enter();
-    void leave();
-    void startDrag();
-    void grabMouseSafely();
-
-    bool isAnimated() const
-    { return m_timeLine.state() == QTimeLine::Running; }
-
-public slots:
-    void animateDrag(int frame);
-
-protected:
-    virtual void mouseMoveEvent(QMouseEvent *);
-    virtual void paintEvent(QPaintEvent *event);
-    virtual void mouseReleaseEvent(QMouseEvent *);
-private:
-    QWidget *m_oldTarget;
-    QPixmap m_preview;
-    QPixmap m_icon;
-    QTimeLine m_timeLine;
-    QSize m_size;
-    qreal m_iconAlpha, m_previewAlpha;
-};
-
-
-class CustomDragAndDrop { //this class handles the drag and drop logic
-public:
-    static void startCustomDrag(const QPixmap icon, const QPixmap preview, QMimeData * mimeData);
-    static bool customDragActive();
-    static bool isAccepted();
-    static void endCustomDrag();
-    static void enter(QWidget *target, QPoint globalPos);
-    static void leave(QWidget *target, QPoint globalPos);
-    static void move(QWidget *target, QPoint globalPos);
-    static void drop(QWidget *target, QPoint globalPos);
-    static bool isAnimated();
-    static void hide()
-    { instance()->m_isVisible = false; }
-    static void show()
-    {
-        instance()->m_isVisible = true;
-        instance()->m_widget->show();
-        instance()->m_widget->update();
-    }
-    static bool isVisible()
-    { return instance()->m_isVisible; }
-
-private:
-    CustomDragAndDrop();
-    static CustomDragAndDrop* instance();
-    static CustomDragAndDrop* m_instance;
-
-    CustomDragAndDropIcon *m_widget;
-    bool m_customDragActive;
-    QPoint m_pos;
-    QMimeData *m_mimeData;
-    bool m_accepted;
-    bool m_isVisible;
-
-    friend class CustomDragAndDropGuard;
-};
-
-} //namespace QmlDesignerItemLibraryDragAndDrop
-
-class CustomItemLibraryDrag : public QDrag {
-    Q_OBJECT
-    public:
-        CustomItemLibraryDrag(QWidget * dragSource) : QDrag(dragSource), m_mimeData(0)
-        {}
-        void setPixmap(const QPixmap &pixmap)
-        { m_pixmap = pixmap; }
-        void setPreview(const QPixmap &pixmap)
-        { m_preview = pixmap; }
-        void setMimeData(QMimeData *mimeData)
-        { m_mimeData = mimeData; }
-        void exec()
-        { QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::startCustomDrag(m_pixmap, m_preview, m_mimeData); }
-
-    public slots:
-        void stopDrag() {
-            QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::endCustomDrag();
-        }
-
-private:
-        QPixmap m_pixmap, m_preview;
-        QMimeData *m_mimeData;
-    };
-
-} //namespave QmlDesigner
-
-#endif // CUSTOMDRAGANDDROP_H

src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri

@@ -1,8 +1,8 @@
 VPATH += $$PWD
 
 # Input
-HEADERS += itemlibraryview.h itemlibrarywidget.h customdraganddrop.h itemlibrarymodel.h itemlibrarycomponents.h itemlibraryimageprovider.h
+HEADERS += itemlibraryview.h itemlibrarywidget.h itemlibrarymodel.h itemlibrarycomponents.h itemlibraryimageprovider.h
-SOURCES += itemlibraryview.cpp itemlibrarywidget.cpp customdraganddrop.cpp itemlibrarymodel.cpp itemlibrarycomponents.cpp itemlibraryimageprovider.cpp
+SOURCES += itemlibraryview.cpp itemlibrarywidget.cpp itemlibrarymodel.cpp itemlibrarycomponents.cpp itemlibraryimageprovider.cpp
 RESOURCES += itemlibrary.qrc
 
 OTHER_FILES += \

src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp

@@ -28,12 +28,12 @@
 ****************************************************************************/
 
 #include "itemlibrarycomponents.h"
-#include "customdraganddrop.h"
 
 #include <QMimeData>
 #include <QDebug>
 
 #include <QPixmap>
+#include <QDrag>
 #include <QPainter>
 #include <QFileSystemModel>
 #include <QProxyStyle>
@@ -118,8 +118,7 @@ void ItemLibraryTreeView::startDrag(Qt::DropActions /* supportedActions */)
     QFileInfo fileInfo = fileSystemModel->fileInfo(selectedIndexes().front());
     QPixmap pixmap(fileInfo.absoluteFilePath());
     if (!pixmap.isNull()) {
-        CustomItemLibraryDrag *drag = new CustomItemLibraryDrag(this);
+        QDrag *drag = new QDrag(this);
-        drag->setPreview(pixmap);
         drag->setPixmap(QIcon(pixmap).pixmap(128, 128));
         QMimeData *mimeData = new QMimeData;
         mimeData->setData("application/vnd.bauhaus.libraryresource", fileInfo.absoluteFilePath().toUtf8());

src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp

@@ -33,7 +33,6 @@
 #include <coreplugin/coreconstants.h>
 #include "itemlibrarymodel.h"
 #include "itemlibraryimageprovider.h"
-#include "customdraganddrop.h"
 #include <model.h>
 #include <metainfo.h>
 #include "rewritingexception.h"