From f48e288665e054449a60e31031581c0fae5f795f Mon Sep 17 00:00:00 2001 From: sirmangler Date: Mon, 15 May 2023 16:27:33 +0100 Subject: [PATCH] Update about window, properly open URLs --- pcsx2-winrt/App.cpp | 7 ++++++- pcsx2/ImGui/FullscreenUI.cpp | 16 ++++++++-------- pcsx2/SysForwardDefs.h | 6 +++--- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/pcsx2-winrt/App.cpp b/pcsx2-winrt/App.cpp index 74ddfc7ac35e7..5606f6395092d 100644 --- a/pcsx2-winrt/App.cpp +++ b/pcsx2-winrt/App.cpp @@ -200,7 +200,12 @@ bool Host::ConfirmMessage(const std::string_view& title, const std::string_view& void Host::OpenURL(const std::string_view& url) { - // noop + winrt::Windows::Foundation::Uri m_uri { winrt::to_hstring(url) }; + auto asyncOperation = winrt::Windows::System::Launcher::LaunchUriAsync(m_uri); + asyncOperation.Completed([](winrt::Windows::Foundation::IAsyncOperation const& sender, + winrt::Windows::Foundation::AsyncStatus const asyncStatus) { + return; + }); } bool Host::CopyTextToClipboard(const std::string_view& text) diff --git a/pcsx2/ImGui/FullscreenUI.cpp b/pcsx2/ImGui/FullscreenUI.cpp index 947c3d5c529c7..ed6d481752074 100644 --- a/pcsx2/ImGui/FullscreenUI.cpp +++ b/pcsx2/ImGui/FullscreenUI.cpp @@ -5863,7 +5863,7 @@ void FullscreenUI::OpenAboutWindow() void FullscreenUI::DrawAboutWindow() { - ImGui::SetNextWindowSize(LayoutScale(1000.0f, 500.0f)); + ImGui::SetNextWindowSize(LayoutScale(1000.0f, 535.0f)); ImGui::SetNextWindowPos(ImGui::GetIO().DisplaySize * 0.5f, ImGuiCond_Always, ImVec2(0.5f, 0.5f)); ImGui::OpenPopup("About XBSX2.0"); @@ -5874,7 +5874,10 @@ void FullscreenUI::DrawAboutWindow() if (ImGui::BeginPopupModal("About XBSX2.0", &s_about_window_open, ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize)) { ImGui::TextWrapped( - "XBSX2.0 is a fork of PCSX2 developed by SirMangler introducing Xbox/UWP support. Please support the original creators." + "XBSX2.0 is a fork of PCSX2 developed by SirMangler, TRW and Reverie introducing Xbox/UWP support. Please support the original creators."); + ImGui::NewLine(); + + ImGui::TextWrapped( "PCSX2 is a free and open-source PlayStation 2 (PS2) emulator. Its purpose is to emulate the PS2's hardware, using a " "combination of MIPS CPU Interpreters, Recompilers and a Virtual Machine which manages hardware states and PS2 system memory. " "This allows you to play PS2 games on your PC, with many additional features and benefits."); @@ -5888,13 +5891,10 @@ void FullscreenUI::DrawAboutWindow() BeginMenuButtons(); - if (ActiveButton(ICON_FA_GLOBE " Website", false)) - ExitFullscreenAndOpenURL(PCSX2_WEBSITE_URL); - - if (ActiveButton(ICON_FA_PERSON_BOOTH " Support Forums", false)) - ExitFullscreenAndOpenURL(PCSX2_FORUMS_URL); + if (ActiveButton(ICON_FA_PERSON_BOOTH " Discord", false)) + ExitFullscreenAndOpenURL(PCSX2_DISCORD_URL); - if (ActiveButton(ICON_FA_BUG " PCSX2 GitHub Repository", false)) + if (ActiveButton(ICON_FA_BUG " XBSX2.0 GitHub Repository", false)) ExitFullscreenAndOpenURL(PCSX2_GITHUB_URL); if (ActiveButton(ICON_FA_NEWSPAPER " License", false)) diff --git a/pcsx2/SysForwardDefs.h b/pcsx2/SysForwardDefs.h index 0c72ba92e308e..e5593a817103d 100644 --- a/pcsx2/SysForwardDefs.h +++ b/pcsx2/SysForwardDefs.h @@ -38,8 +38,8 @@ #define PCSX2_WEBSITE_URL "https://pcsx2.net/" #define PCSX2_FORUMS_URL "https://forums.pcsx2.net/" -#define PCSX2_GITHUB_URL "https://github.com/PCSX2/pcsx2" -#define PCSX2_LICENSE_URL "https://github.com/PCSX2/pcsx2/blob/master/pcsx2/Docs/License.txt" -#define PCSX2_DISCORD_URL "https://discord.com/invite/TCz3t9k" +#define PCSX2_GITHUB_URL "https://github.com/SirMangler/pcsx2" +#define PCSX2_LICENSE_URL "https://github.com/SirMangler/pcsx2/blob/master/pcsx2/Docs/License.txt" +#define PCSX2_DISCORD_URL "https://discord.gg/UXVT66JSm8" static const bool PCSX2_isReleaseVersion = 0;