diff options
| author | 2019-11-02 19:22:36 +0100 | |
|---|---|---|
| committer | 2019-11-03 05:24:47 +0100 | |
| commit | 727ba2f2d05967cc5934c340587a9d4fd5ec550c (patch) | |
| tree | 71c2d63fa0ea63aa29033102ace5a2b91d15ed79 /src | |
| parent | Merge pull request #3054 from FernandoS27/fix-tld4-2 (diff) | |
| download | yuzu-727ba2f2d05967cc5934c340587a9d4fd5ec550c.tar.gz yuzu-727ba2f2d05967cc5934c340587a9d4fd5ec550c.tar.xz yuzu-727ba2f2d05967cc5934c340587a9d4fd5ec550c.zip | |
citra_qt: add amiibo drag and drop support
Co-Authored-By: Valentin Vanelslande <vvanelslandedev@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | src/yuzu/main.cpp | 21 | ||||
| -rw-r--r-- | src/yuzu/main.h | 1 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index d6bb18d24..160613ee1 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -1839,6 +1839,10 @@ void GMainWindow::OnLoadAmiibo() { | |||
| 1839 | return; | 1839 | return; |
| 1840 | } | 1840 | } |
| 1841 | 1841 | ||
| 1842 | LoadAmiibo(filename); | ||
| 1843 | } | ||
| 1844 | |||
| 1845 | void GMainWindow::LoadAmiibo(const QString& filename) { | ||
| 1842 | Core::System& system{Core::System::GetInstance()}; | 1846 | Core::System& system{Core::System::GetInstance()}; |
| 1843 | Service::SM::ServiceManager& sm = system.ServiceManager(); | 1847 | Service::SM::ServiceManager& sm = system.ServiceManager(); |
| 1844 | auto nfc = sm.GetService<Service::NFP::Module::Interface>("nfp:user"); | 1848 | auto nfc = sm.GetService<Service::NFP::Module::Interface>("nfp:user"); |
| @@ -2189,10 +2193,19 @@ static bool IsSingleFileDropEvent(QDropEvent* event) { | |||
| 2189 | } | 2193 | } |
| 2190 | 2194 | ||
| 2191 | void GMainWindow::dropEvent(QDropEvent* event) { | 2195 | void GMainWindow::dropEvent(QDropEvent* event) { |
| 2192 | if (IsSingleFileDropEvent(event) && ConfirmChangeGame()) { | 2196 | if (!IsSingleFileDropEvent(event)) { |
| 2193 | const QMimeData* mimeData = event->mimeData(); | 2197 | return; |
| 2194 | QString filename = mimeData->urls().at(0).toLocalFile(); | 2198 | } |
| 2195 | BootGame(filename); | 2199 | |
| 2200 | const QMimeData* mime_data = event->mimeData(); | ||
| 2201 | const QString filename = mime_data->urls().at(0).toLocalFile(); | ||
| 2202 | |||
| 2203 | if (emulation_running && QFileInfo(filename).suffix() == QStringLiteral("bin")) { | ||
| 2204 | LoadAmiibo(filename); | ||
| 2205 | } else { | ||
| 2206 | if (ConfirmChangeGame()) { | ||
| 2207 | BootGame(filename); | ||
| 2208 | } | ||
| 2196 | } | 2209 | } |
| 2197 | } | 2210 | } |
| 2198 | 2211 | ||
diff --git a/src/yuzu/main.h b/src/yuzu/main.h index fd4b9ccf5..7f46bea2b 100644 --- a/src/yuzu/main.h +++ b/src/yuzu/main.h | |||
| @@ -142,6 +142,7 @@ private: | |||
| 142 | 142 | ||
| 143 | void ShowTelemetryCallout(); | 143 | void ShowTelemetryCallout(); |
| 144 | void SetDiscordEnabled(bool state); | 144 | void SetDiscordEnabled(bool state); |
| 145 | void LoadAmiibo(const QString& filename); | ||
| 145 | 146 | ||
| 146 | void SelectAndSetCurrentUser(); | 147 | void SelectAndSetCurrentUser(); |
| 147 | 148 | ||