diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-04-01 15:49:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-04-01 15:49:22 +0200 |
commit | 1ab052952dcc3c612837262474c91ed8780961c3 (patch) | |
tree | 2ef9339cd92fd2271ee1b42a8ec19bf79c4954a8 /src/core/frontend | |
parent | Merge pull request #9997 from german77/cancel_controller (diff) | |
parent | service: am: Improve profile select applet (diff) | |
download | yuzu-1ab052952dcc3c612837262474c91ed8780961c3.tar yuzu-1ab052952dcc3c612837262474c91ed8780961c3.tar.gz yuzu-1ab052952dcc3c612837262474c91ed8780961c3.tar.bz2 yuzu-1ab052952dcc3c612837262474c91ed8780961c3.tar.lz yuzu-1ab052952dcc3c612837262474c91ed8780961c3.tar.xz yuzu-1ab052952dcc3c612837262474c91ed8780961c3.tar.zst yuzu-1ab052952dcc3c612837262474c91ed8780961c3.zip |
Diffstat (limited to 'src/core/frontend')
-rw-r--r-- | src/core/frontend/applets/profile_select.cpp | 3 | ||||
-rw-r--r-- | src/core/frontend/applets/profile_select.h | 16 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/core/frontend/applets/profile_select.cpp b/src/core/frontend/applets/profile_select.cpp index 910d20c0d..c18f17a36 100644 --- a/src/core/frontend/applets/profile_select.cpp +++ b/src/core/frontend/applets/profile_select.cpp @@ -11,7 +11,8 @@ ProfileSelectApplet::~ProfileSelectApplet() = default; void DefaultProfileSelectApplet::Close() const {} -void DefaultProfileSelectApplet::SelectProfile(SelectProfileCallback callback) const { +void DefaultProfileSelectApplet::SelectProfile(SelectProfileCallback callback, + const ProfileSelectParameters& parameters) const { Service::Account::ProfileManager manager; callback(manager.GetUser(Settings::values.current_user.GetValue()).value_or(Common::UUID{})); LOG_INFO(Service_ACC, "called, selecting current user instead of prompting..."); diff --git a/src/core/frontend/applets/profile_select.h b/src/core/frontend/applets/profile_select.h index 76e963535..92e2737ea 100644 --- a/src/core/frontend/applets/profile_select.h +++ b/src/core/frontend/applets/profile_select.h @@ -5,25 +5,35 @@ #include <functional> #include <optional> -#include "common/uuid.h" +#include "common/uuid.h" #include "core/frontend/applets/applet.h" +#include "core/hle/service/am/applets/applet_profile_select.h" namespace Core::Frontend { +struct ProfileSelectParameters { + Service::AM::Applets::UiMode mode; + std::array<Common::UUID, 8> invalid_uid_list; + Service::AM::Applets::UiSettingsDisplayOptions display_options; + Service::AM::Applets::UserSelectionPurpose purpose; +}; + class ProfileSelectApplet : public Applet { public: using SelectProfileCallback = std::function<void(std::optional<Common::UUID>)>; virtual ~ProfileSelectApplet(); - virtual void SelectProfile(SelectProfileCallback callback) const = 0; + virtual void SelectProfile(SelectProfileCallback callback, + const ProfileSelectParameters& parameters) const = 0; }; class DefaultProfileSelectApplet final : public ProfileSelectApplet { public: void Close() const override; - void SelectProfile(SelectProfileCallback callback) const override; + void SelectProfile(SelectProfileCallback callback, + const ProfileSelectParameters& parameters) const override; }; } // namespace Core::Frontend |