diff options
| author | 2020-11-30 10:15:00 -0500 | |
|---|---|---|
| committer | 2020-12-18 10:33:28 -0500 | |
| commit | 8b95bf041da573459e953e27eee2dcf30208b02d (patch) | |
| tree | f3213286284f1931b1de5d3af67d1e632d2e1bd1 /src/core/frontend/applets | |
| parent | applets/web: Implement the Qt web browser applet frontend (diff) | |
| download | yuzu-8b95bf041da573459e953e27eee2dcf30208b02d.tar.gz yuzu-8b95bf041da573459e953e27eee2dcf30208b02d.tar.xz yuzu-8b95bf041da573459e953e27eee2dcf30208b02d.zip | |
main, applets/web: Re-add progress dialog for RomFS extraction
Diffstat (limited to 'src/core/frontend/applets')
| -rw-r--r-- | src/core/frontend/applets/web_browser.cpp | 5 | ||||
| -rw-r--r-- | src/core/frontend/applets/web_browser.h | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/frontend/applets/web_browser.cpp b/src/core/frontend/applets/web_browser.cpp index 0e1612e27..a5d8f82ac 100644 --- a/src/core/frontend/applets/web_browser.cpp +++ b/src/core/frontend/applets/web_browser.cpp | |||
| @@ -12,11 +12,12 @@ WebBrowserApplet::~WebBrowserApplet() = default; | |||
| 12 | DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default; | 12 | DefaultWebBrowserApplet::~DefaultWebBrowserApplet() = default; |
| 13 | 13 | ||
| 14 | void DefaultWebBrowserApplet::OpenLocalWebPage( | 14 | void DefaultWebBrowserApplet::OpenLocalWebPage( |
| 15 | std::string_view local_url, std::function<void(WebExitReason, std::string)> callback) const { | 15 | std::string_view local_url, std::function<void()> extract_romfs_callback, |
| 16 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const { | ||
| 16 | LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to open local web page at {}", | 17 | LOG_WARNING(Service_AM, "(STUBBED) called, backend requested to open local web page at {}", |
| 17 | local_url); | 18 | local_url); |
| 18 | 19 | ||
| 19 | callback(WebExitReason::WindowClosed, "http://localhost/"); | 20 | callback(Service::AM::Applets::WebExitReason::WindowClosed, "http://localhost/"); |
| 20 | } | 21 | } |
| 21 | 22 | ||
| 22 | } // namespace Core::Frontend | 23 | } // namespace Core::Frontend |
diff --git a/src/core/frontend/applets/web_browser.h b/src/core/frontend/applets/web_browser.h index 2ccefc68f..5b0629cfb 100644 --- a/src/core/frontend/applets/web_browser.h +++ b/src/core/frontend/applets/web_browser.h | |||
| @@ -9,8 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | #include "core/hle/service/am/applets/web_types.h" | 10 | #include "core/hle/service/am/applets/web_types.h" |
| 11 | 11 | ||
| 12 | using namespace Service::AM::Applets; | ||
| 13 | |||
| 14 | namespace Core::Frontend { | 12 | namespace Core::Frontend { |
| 15 | 13 | ||
| 16 | class WebBrowserApplet { | 14 | class WebBrowserApplet { |
| @@ -18,16 +16,17 @@ public: | |||
| 18 | virtual ~WebBrowserApplet(); | 16 | virtual ~WebBrowserApplet(); |
| 19 | 17 | ||
| 20 | virtual void OpenLocalWebPage( | 18 | virtual void OpenLocalWebPage( |
| 21 | std::string_view local_url, | 19 | std::string_view local_url, std::function<void()> extract_romfs_callback, |
| 22 | std::function<void(WebExitReason, std::string)> callback) const = 0; | 20 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> callback) const = 0; |
| 23 | }; | 21 | }; |
| 24 | 22 | ||
| 25 | class DefaultWebBrowserApplet final : public WebBrowserApplet { | 23 | class DefaultWebBrowserApplet final : public WebBrowserApplet { |
| 26 | public: | 24 | public: |
| 27 | ~DefaultWebBrowserApplet() override; | 25 | ~DefaultWebBrowserApplet() override; |
| 28 | 26 | ||
| 29 | void OpenLocalWebPage(std::string_view local_url, | 27 | void OpenLocalWebPage(std::string_view local_url, std::function<void()> extract_romfs_callback, |
| 30 | std::function<void(WebExitReason, std::string)> callback) const override; | 28 | std::function<void(Service::AM::Applets::WebExitReason, std::string)> |
| 29 | callback) const override; | ||
| 31 | }; | 30 | }; |
| 32 | 31 | ||
| 33 | } // namespace Core::Frontend | 32 | } // namespace Core::Frontend |