Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix wx drag events to actually be keyed off of the Qt dragging state instead of its "drop" events.

Browse Source 
Add "dropped" state to track whether a drop actually occurred or whether the drag ended unsuccessfully.
This commit is contained in:
Jay Nabonne
2019-02-07 11:36:15 +00:00
parent 5279d0bca5
commit 541e7af374
1 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/qt/treectrl.cpp
View File

@@ -103,7 +103,8 @@ class wxQTreeWidget : public wxQtEventSignalHandler<QTreeWidget, wxTreeCtrl>
public: public:
wxQTreeWidget(wxWindow *parent, wxTreeCtrl *handler) : wxQTreeWidget(wxWindow *parent, wxTreeCtrl *handler) :
wxQtEventSignalHandler(parent, handler), wxQtEventSignalHandler(parent, handler),
m_editorFactory(handler) m_editorFactory(handler),
m_dropped(false)
{ {
connect(this, &QTreeWidget::currentItemChanged, this, &wxQTreeWidget::OnCurrentItemChanged); connect(this, &QTreeWidget::currentItemChanged, this, &wxQTreeWidget::OnCurrentItemChanged);
connect(this, &QTreeWidget::itemActivated, this, &wxQTreeWidget::OnItemActivated); connect(this, &QTreeWidget::itemActivated, this, &wxQTreeWidget::OnItemActivated);
@@ -142,7 +143,7 @@ protected:
QTreeWidget::drawBranches(painter, rect, index); QTreeWidget::drawBranches(painter, rect, index);
const int imageIndex = ChooseBestImage(item); const int imageIndex = ChooseBestImage(item);
if (imageIndex != -1 ) if ( imageIndex != -1 )
{ {
wxImageList *imageList = GetHandler()->GetImageList(); wxImageList *imageList = GetHandler()->GetImageList();
wxBitmap bitmap = imageList->GetBitmap(imageIndex); wxBitmap bitmap = imageList->GetBitmap(imageIndex);
@@ -228,13 +229,14 @@ private:
EmitEvent(expandedEvent); EmitEvent(expandedEvent);
} }
virtual void dragEnterEvent(QDragEnterEvent* event) wxOVERRIDE void tryStartDrag(const QMouseEvent *event)
{ {
wxEventType command = (event->mouseButtons() & Qt::RightButton) m_dropped = false;
wxEventType command = (event->buttons() & Qt::RightButton)
? wxEVT_TREE_BEGIN_RDRAG ? wxEVT_TREE_BEGIN_RDRAG
: wxEVT_TREE_BEGIN_DRAG; : wxEVT_TREE_BEGIN_DRAG;
QTreeWidgetItem *hitItem = itemAt(event->pos()); QTreeWidgetItem *hitItem = itemAt(event->pos());
wxTreeEvent tree_event( wxTreeEvent tree_event(
@@ -250,13 +252,13 @@ private:
EmitEvent(tree_event); EmitEvent(tree_event);
if ( tree_event.IsAllowed() ) if ( !tree_event.IsAllowed() )
{ {
event->accept(); setState(DragSelectingState);
} }
} }
virtual void dropEvent(QDropEvent* event) wxOVERRIDE void endDrag(const QMouseEvent* event)
{ {
const wxPoint pos = wxQtConvertPoint(event->pos()); const wxPoint pos = wxQtConvertPoint(event->pos());
QTreeWidgetItem *hitItem = itemAt(event->pos()); QTreeWidgetItem *hitItem = itemAt(event->pos());
@@ -272,6 +274,32 @@ private:
EmitEvent(tree_event); EmitEvent(tree_event);
} }
virtual void dropEvent(QDropEvent* event) wxOVERRIDE
{
m_dropped = true;
// We don't want Qt to actually do the drop.
event->ignore();
}
virtual void mouseMoveEvent(QMouseEvent *event) wxOVERRIDE
{
const bool wasDragging = state() == DraggingState;
wxQtEventSignalHandler<QTreeWidget, wxTreeCtrl>::mouseMoveEvent(event);
const bool nowDragging = state() == DraggingState;
if ( !wasDragging && nowDragging )
{
tryStartDrag(event);
}
else if ( wasDragging && !nowDragging )
{
// Only emit "end drag" if we have dropped
// (e.g. not hit escape to cancel).
if ( m_dropped )
endDrag(event);
}
}
int ChooseBestImage(QTreeWidgetItem *item) const int ChooseBestImage(QTreeWidgetItem *item) const
{ {
int imageIndex = -1; int imageIndex = -1;
@@ -306,6 +334,7 @@ private:
typedef std::map<QTreeWidgetItem*,ImageState> ImageStateMap; typedef std::map<QTreeWidgetItem*,ImageState> ImageStateMap;
ImageStateMap m_imageStates; ImageStateMap m_imageStates;
bool m_dropped;
}; };
wxTreeCtrl::wxTreeCtrl() : wxTreeCtrl::wxTreeCtrl() :