installer: adopt the restyled setup wizards
This commit is contained in:
parent
75c8487ee6
commit
ee09d1655a
4 changed files with 15 additions and 3 deletions
|
|
@ -385,7 +385,7 @@ void ShowRexglueIsoInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig r
|
||||||
};
|
};
|
||||||
|
|
||||||
new rex::ui::InstallWizardDialog(
|
new rex::ui::InstallWizardDialog(
|
||||||
drawer, "Skate 3 Setup",
|
drawer, "Setup", "Game Files",
|
||||||
"Skate 3 game files were not found. Select your Xbox 360 ISO to install them.",
|
"Skate 3 game files were not found. Select your Xbox 360 ISO to install them.",
|
||||||
runtime_paths.game_data_root.string(), std::move(pick_source), std::move(install),
|
runtime_paths.game_data_root.string(), std::move(pick_source), std::move(install),
|
||||||
[runtime_paths = std::move(runtime_paths), complete = std::move(complete)]() mutable {
|
[runtime_paths = std::move(runtime_paths), complete = std::move(complete)]() mutable {
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
#include <rex/cvar.h>
|
#include <rex/cvar.h>
|
||||||
#include <rex/graphics/native_guest_renderer.h>
|
#include <rex/graphics/native_guest_renderer.h>
|
||||||
|
#include <rex/ui/presenter.h>
|
||||||
|
|
||||||
#include "skate3_native_scene.h"
|
#include "skate3_native_scene.h"
|
||||||
|
|
||||||
|
|
@ -411,6 +412,15 @@ void RenderModeIndicator::OnDraw(ImGuiIO& io) {
|
||||||
if (!REXCVAR_GET(skate3_native_render_mode_indicator)) {
|
if (!REXCVAR_GET(skate3_native_render_mode_indicator)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
// Pre-runtime (installer wizards) no guest frame exists yet - there is no
|
||||||
|
// renderer to indicate.
|
||||||
|
if (rex::ui::Presenter* presenter = imgui_drawer()->presenter()) {
|
||||||
|
const rex::ui::Presenter::GuestOutputPaintRect rect =
|
||||||
|
presenter->GetLastGuestOutputPaintRect();
|
||||||
|
if (rect.width <= 0 || rect.height <= 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
const bool native = rex::graphics::IsNativeGuestOutputActive();
|
const bool native = rex::graphics::IsNativeGuestOutputActive();
|
||||||
ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x - 10.0f, 10.0f), ImGuiCond_Always,
|
ImGui::SetNextWindowPos(ImVec2(io.DisplaySize.x - 10.0f, 10.0f), ImGuiCond_Always,
|
||||||
ImVec2(1.0f, 0.0f));
|
ImVec2(1.0f, 0.0f));
|
||||||
|
|
|
||||||
|
|
@ -770,7 +770,8 @@ void ShowTitleUpdateInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig
|
||||||
const auto game_root = runtime_paths.game_data_root;
|
const auto game_root = runtime_paths.game_data_root;
|
||||||
|
|
||||||
rex::ui::AcquireWizardDialog::Options options;
|
rex::ui::AcquireWizardDialog::Options options;
|
||||||
options.title = "Skate 3 Title Update";
|
options.title = "Setup";
|
||||||
|
options.section_label = "Title Update 3";
|
||||||
options.intro =
|
options.intro =
|
||||||
"This build of Skate 3 requires Title Update 3, a free update originally published on "
|
"This build of Skate 3 requires Title Update 3, a free update originally published on "
|
||||||
"Xbox Live. It is not part of the game disc.";
|
"Xbox Live. It is not part of the game disc.";
|
||||||
|
|
@ -785,6 +786,7 @@ void ShowTitleUpdateInstallWizard(rex::ui::ImGuiDrawer* drawer, rex::PathConfig
|
||||||
options.install_working_status = "Installing the title update...";
|
options.install_working_status = "Installing the title update...";
|
||||||
options.done_status = "Title Update 3 installed.";
|
options.done_status = "Title Update 3 installed.";
|
||||||
options.done_button_label = "Start Game";
|
options.done_button_label = "Start Game";
|
||||||
|
options.launching_status = "Starting the game...";
|
||||||
|
|
||||||
auto fetch = [game_root](std::atomic<uint64_t>& copied_bytes, std::atomic<uint64_t>& total_bytes,
|
auto fetch = [game_root](std::atomic<uint64_t>& copied_bytes, std::atomic<uint64_t>& total_bytes,
|
||||||
std::string& error) {
|
std::string& error) {
|
||||||
|
|
|
||||||
2
third_party/rexglue-sdk
vendored
2
third_party/rexglue-sdk
vendored
|
|
@ -1 +1 @@
|
||||||
Subproject commit a8e28405f9bd56924b494012166212189c8948aa
|
Subproject commit fc70322f3d50ea0833c7894c1d31d9e30e693a05
|
||||||
Loading…
Add table
Reference in a new issue