Skip to content

Commit

Permalink
Update about window, properly open URLs
Browse files Browse the repository at this point in the history
  • Loading branch information
SirMangler authored and TheRhysWyrill committed Jun 8, 2023
1 parent 593fa11 commit f48e288
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
7 changes: 6 additions & 1 deletion pcsx2-winrt/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool> const& sender,
winrt::Windows::Foundation::AsyncStatus const asyncStatus) {
return;
});
}

bool Host::CopyTextToClipboard(const std::string_view& text)
Expand Down
16 changes: 8 additions & 8 deletions pcsx2/ImGui/FullscreenUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand All @@ -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.");
Expand All @@ -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))
Expand Down
6 changes: 3 additions & 3 deletions pcsx2/SysForwardDefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

0 comments on commit f48e288

Please sign in to comment.