ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gui: Fix/simplify memory card dialog drag and drop 

wxDataObjectSimple derived classes do not use a wxDataFormatId
parameter (only the wxDF_INVALID, wxDF_TEXT, wxDF_BITMAP, wxDF_METAFILE,
wxDF_FILENAME, and wxDF_HTML wxDataFormatIds are allowed because they
are implicitly converted). So drag and drop probably should have been
broken on Windows, but wasn't for whatever reason.

Let's fix and simplify the code by just using the built in
wxCustomDataObject. Also make move the default drag behaviour on both
Windows and Linux (previously default on Windows only).

It now works on Windows and Linux wx2.8/wx3.0 (previously only working
on Windows).
This commit is contained in:
Jonathan Li 2015-10-06 18:31:43 +01:00
parent abdb8266b6
commit 919bdf05fe
1 changed files with 13 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
pcsx2/gui/Panels/MemoryCardListPanel.cpp
View File

@ -30,6 +30,8 @@
#include <wx/dir.h> #include <wx/dir.h>
static wxDataFormat drag_drop_format(L"PCSX2McdDragDrop");
bool CopyDirectory( const wxString& from, const wxString& to ); bool CopyDirectory( const wxString& from, const wxString& to );
bool RemoveDirectory( const wxString& dirname ); bool RemoveDirectory( const wxString& dirname );
@ -261,76 +263,6 @@ void Panels::BaseMcdListPanel::AppStatusEvent_OnSettingsApplied()
} }
} }
// --------------------------------------------------------------------------------------
// McdDataObject
// --------------------------------------------------------------------------------------
class WXDLLEXPORT McdDataObject : public wxDataObjectSimple
{
DECLARE_NO_COPY_CLASS(McdDataObject)
protected:
int m_viewIndex;
public:
McdDataObject(int viewIndex = -1)
#ifdef __linux__
// XXX: On linux drag and drop doesn't work. I think wxDF_PRIVATE is a MS extension.
// Besides it will raise on assertion on wx3.0.
//
// wxDF_FILENAME returns the filename of the memory card dropped. Maybe code can be updated
// to use it. However Model/view stuff is not my cup of tea so I will
// let others improve it on linux. --Greg
: wxDataObjectSimple( /*wxDF_FILENAME*/ )
#else
: wxDataObjectSimple( wxDF_PRIVATE )
#endif
{
m_viewIndex = viewIndex;
}
uint GetViewIndex() const
{
pxAssertDev( m_viewIndex >= 0, "memory card view-Index is uninitialized (invalid drag&drop object state)" );
return (uint)m_viewIndex;
}
size_t GetDataSize() const
{
return sizeof(u32);
}
bool GetDataHere(void *buf) const
{
*(u32*)buf = GetViewIndex();
return true;
}
virtual bool SetData(size_t len, const void *buf)
{
if( !pxAssertDev( len == sizeof(u32), "Data length mismatch on memory card drag&drop operation." ) ) return false;
m_viewIndex = *(u32*)buf;
return true;//( (uint)m_viewIndex < 8 ); // sanity check (unsigned, so that -1 also is invalid) :)
}
// Must provide overloads to avoid hiding them (and warnings about it)
virtual size_t GetDataSize(const wxDataFormat&) const
{
return GetDataSize();
}
virtual bool GetDataHere(const wxDataFormat&, void *buf) const
{
return GetDataHere(buf);
}
virtual bool SetData(const wxDataFormat&, size_t len, const void *buf)
{
return SetData(len, buf);
}
};
class McdDropTarget : public wxDropTarget class McdDropTarget : public wxDropTarget
{ {
protected: protected:
@ -340,7 +272,7 @@ public:
McdDropTarget( BaseMcdListView* listview=NULL ) McdDropTarget( BaseMcdListView* listview=NULL )
{ {
m_listview = listview; m_listview = listview;
SetDataObject(new McdDataObject()); SetDataObject(new wxCustomDataObject(drag_drop_format));
} }
// these functions are called when data is moved over position (x, y) and // these functions are called when data is moved over position (x, y) and
@ -395,8 +327,13 @@ public:
if ( !GetData() ) if ( !GetData() )
return wxDragNone; return wxDragNone;
McdDataObject *dobj = (McdDataObject *)GetDataObject(); wxCustomDataObject *dobj = static_cast<wxCustomDataObject *>(GetDataObject());
int sourceViewIndex = dobj->GetViewIndex();
if (dobj->GetDataSize() != sizeof(int))
return wxDragNone;
int sourceViewIndex;
dobj->GetDataHere(&sourceViewIndex);
wxDragResult result = OnDropMcd( wxDragResult result = OnDropMcd(
m_listview->GetMcdProvider().GetCardForViewIndex( sourceViewIndex ), m_listview->GetMcdProvider().GetCardForViewIndex( sourceViewIndex ),
@ -1102,11 +1039,12 @@ void Panels::MemoryCardListPanel_Simple::OnListDrag(wxListEvent& evt)
int selectionViewIndex = m_listview->GetFirstSelected(); int selectionViewIndex = m_listview->GetFirstSelected();
if( selectionViewIndex < 0 ) return; if( selectionViewIndex < 0 ) return;
McdDataObject my_data( selectionViewIndex ); wxCustomDataObject my_data(drag_drop_format);
my_data.SetData(sizeof(int), &selectionViewIndex);
wxDropSource dragSource( m_listview ); wxDropSource dragSource( m_listview );
dragSource.SetData( my_data ); dragSource.SetData( my_data );
/*wxDragResult result = */dragSource.DoDragDrop( wxDrag_AllowMove ); /*wxDragResult result = */dragSource.DoDragDrop( wxDrag_DefaultMove );
} }
void Panels::MemoryCardListPanel_Simple::OnListSelectionChanged(wxListEvent& evt) void Panels::MemoryCardListPanel_Simple::OnListSelectionChanged(wxListEvent& evt)