Differential D16643 Diff 50979 src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp

Changeset View

Standalone View

View Options

src/qmlcontrols/draganddrop/DeclarativeDropArea.cpp

Show First 20 Lines • Show All 83 Lines • ▼ Show 20 Line(s)78{
84 DeclarativeDragDropEvent dde(event, this); 84​ DeclarativeDragDropEvent dde(event, this);
85 emit dragLeave(&dde); 85​ emit dragLeave(&dde);
86 setContainsDrag(false); 86​ setContainsDrag(false);
87} 87​}
88 88​
89void DeclarativeDropArea::dragMoveEvent(QDragMoveEvent *event) 89​void DeclarativeDropArea::dragMoveEvent(QDragMoveEvent *event)
90{ 90​{
91 if (!m_enabled || m_temporaryInhibition) { 91​ if (!m_enabled || m_temporaryInhibition) {
92​ event->ignore();
92 return; 93​ return;
93 } 94​ }
94 95​ event->accept();
95 //if the position we export didn't change, don't generate the move event 96​ //if the position we export didn't change, don't generate the move event
96 if (event->pos() == m_oldDragMovePos) { 97​ if (event->pos() == m_oldDragMovePos) {
97 event->setAccepted(false); ​
anthonyfieroniUnsubmitted
Not Done

Change it to accept() and try it.

anthonyfieroni: Change it to accept() and try it.
98 return; 98​ return;
99 } 99​ }
100 100​
101 m_oldDragMovePos = event->pos(); 101​ m_oldDragMovePos = event->pos();
102 DeclarativeDragDropEvent dde(event, this); 102​ DeclarativeDragDropEvent dde(event, this);
103 event->accept(); ​
104 emit dragMove(&dde); 103​ emit dragMove(&dde);
105} 104​}
106 105​
107void DeclarativeDropArea::dropEvent(QDropEvent *event) 106​void DeclarativeDropArea::dropEvent(QDropEvent *event)
108{ 107​{
109 //do it anyways, in the unlikely case m_preventStealing 108​ //do it anyways, in the unlikely case m_preventStealing
110 //was changed while drag, do it after a loop, 109​ //was changed while drag, do it after a loop,
111 //so the parent dropevent doesn't get delivered 110​ //so the parent dropevent doesn't get delivered
▲ Show 20 Lines • Show All 56 Lines • Show Last 20 Lines