mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-04 16:32:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

system/msgdialog: callback available to be used by host

Browse Source
This commit is contained in:
Vinicius Rangel 2024-10-18 18:35:38 -03:00
parent 92b9903467
commit 015550384c
No known key found for this signature in database
GPG Key ID: A5B154D904B761D9
2 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/libraries/system/msgdialog_ui.cpp
View File

@ -238,11 +238,21 @@ void MsgDialogUi::Finish(ButtonId buttonId, Result r) {
}
if (status) {
*status = Status::FINISHED;
if (callback.has_value()) {
callback.value()(DialogResult{
.result = r,
.buttonId = buttonId,
});
}
}
state = nullptr;
status = nullptr;
result = nullptr;
RemoveLayer(this);
if (self_destruct) {
self_destruct = false;
delete this;
}
}
void MsgDialogUi::Draw() {
@ -282,19 +292,24 @@ void MsgDialogUi::Draw() {
first_render = false;
}
DialogResult Libraries::MsgDialog::ShowMsgDialog(MsgDialogState p_state, bool block) {
static DialogResult result{};
static Status status;
static MsgDialogUi dialog;
static MsgDialogState state;
dialog = MsgDialogUi{};
status = Status::RUNNING;
state = std::move(p_state);
dialog = MsgDialogUi(&state, &status, &result);
void Libraries::MsgDialog::ShowMsgDialog(
MsgDialogState p_state, bool block, std::optional<std::function<void(DialogResult)>> callback) {
auto status = new Status{Status::RUNNING};
auto state = new MsgDialogState{std::move(p_state)};
auto dialog = new MsgDialogUi(state, status, nullptr);
bool running = true;
dialog->SetSelfDestruct();
dialog->SetCallback([&, status, state, callback = std::move(callback)](auto result) {
running = false;
delete status;
delete state;
if (callback.has_value()) {
callback.value()(result);
}
});
if (block) {
while (status == Status::RUNNING) {
while (running) {
std::this_thread::sleep_for(std::chrono::milliseconds(100));
}
}
return result;
}

22
src/core/libraries/system/msgdialog_ui.h
View File

@ -3,6 +3,7 @@
#pragma once
#include <optional>
#include <string>
#include <variant>
@ -11,6 +12,8 @@
#include "core/libraries/system/commondialog.h"
#include "imgui/imgui_layer.h"
#include <functional>
namespace Libraries::MsgDialog {
using OrbisUserServiceUserId = s32;
@ -157,6 +160,10 @@ class MsgDialogUi final : public ImGui::Layer {
CommonDialog::Status* status{};
DialogResult* result{};
// HOST ONLY
bool self_destruct{false};
std::optional<std::function<void(DialogResult)>> callback;
void DrawUser();
void DrawProgressBar();
void DrawSystemMessage();
@ -169,13 +176,22 @@ public:
MsgDialogUi(MsgDialogUi&& other) noexcept;
MsgDialogUi& operator=(MsgDialogUi other);
void SetSelfDestruct() {
self_destruct = true;
}
void SetCallback(std::function<void(DialogResult)> callback) {
this->callback = std::move(callback);
}
void Finish(ButtonId buttonId, CommonDialog::Result r = CommonDialog::Result::OK);
void Draw() override;
};
// Utility function to show a message dialog
// !!! This function can block !!!
DialogResult ShowMsgDialog(MsgDialogState state, bool block = true);
// Utility function to show a message dialog from host code
// callback is called from the present thread
void ShowMsgDialog(MsgDialogState state, bool block = false,
std::optional<std::function<void(DialogResult)>> callback = std::nullopt);
}; // namespace Libraries::MsgDialog