N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4948 from vvanelslande/amiibo-dad

Browse source 
citra_qt: add amiibo drag and drop support
This commit is contained in:
Weiyi Wang 2019-10-05 10:47:46 -04:00 committed by GitHub
commit 35690e3ac7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/citra_qt/main.cpp
View file

@ -1461,6 +1461,10 @@ void GMainWindow::OnLoadAmiibo() {
return;
}
LoadAmiibo(filename);
}
void GMainWindow::LoadAmiibo(const QString& filename) {
Core::System& system{Core::System::GetInstance()};
Service::SM::ServiceManager& sm = system.ServiceManager();
auto nfc = sm.GetService<Service::NFC::Module::Interface>("nfc:u");
@ -1857,10 +1861,21 @@ static bool IsSingleFileDropEvent(QDropEvent* event) {
}
void GMainWindow::dropEvent(QDropEvent* event) {
if (IsSingleFileDropEvent(event) && ConfirmChangeGame()) {
const QMimeData* mimeData = event->mimeData();
QString filename = mimeData->urls().at(0).toLocalFile();
BootGame(filename);
if (!IsSingleFileDropEvent(event)) {
return;
}
const QMimeData* mime_data = event->mimeData();
const QString& filename = mime_data->urls().at(0).toLocalFile();
if (emulation_running && QFileInfo(filename).suffix() == "bin") {
// Amiibo
LoadAmiibo(filename);
} else {
// Game
if (ConfirmChangeGame()) {
BootGame(filename);
}
}
}

1
src/citra_qt/main.h
View file

@ -120,6 +120,7 @@ private:
void ShowNoUpdatePrompt();
void CheckForUpdates();
void SetDiscordEnabled(bool state);
void LoadAmiibo(const QString& filename);
/**
* Stores the filename in the recently loaded files list.