From f649b05e52e157f8fa085a5d5e3b088c85ab97c6 Mon Sep 17 00:00:00 2001 From: Elia Zammuto Date: Mon, 12 Jun 2023 21:27:10 +0200 Subject: [PATCH] Changed Welcome Layout --- Assets/qrSupport.svg | 1 + Assets/qrSupportDiscord.svg | 1 - Assets/qrSupportLizardbyte.svg | 1 - Assets/qrSupportWiki.svg | 1 - MoonlightWelcome.xaml | 102 ++++++++++++++++----------------- MoonlightWelcome.xaml.cpp | 3 + Pages/MoonlightSettings.xaml | 2 +- moonlight-xbox-dx.vcxproj | 11 +--- 8 files changed, 56 insertions(+), 66 deletions(-) create mode 100644 Assets/qrSupport.svg delete mode 100644 Assets/qrSupportDiscord.svg delete mode 100644 Assets/qrSupportLizardbyte.svg delete mode 100644 Assets/qrSupportWiki.svg diff --git a/Assets/qrSupport.svg b/Assets/qrSupport.svg new file mode 100644 index 0000000..dc42d2c --- /dev/null +++ b/Assets/qrSupport.svg @@ -0,0 +1 @@ + diff --git a/Assets/qrSupportDiscord.svg b/Assets/qrSupportDiscord.svg deleted file mode 100644 index 7a1a154..0000000 --- a/Assets/qrSupportDiscord.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Assets/qrSupportLizardbyte.svg b/Assets/qrSupportLizardbyte.svg deleted file mode 100644 index b713e5b..0000000 --- a/Assets/qrSupportLizardbyte.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Assets/qrSupportWiki.svg b/Assets/qrSupportWiki.svg deleted file mode 100644 index 2617c7e..0000000 --- a/Assets/qrSupportWiki.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/MoonlightWelcome.xaml b/MoonlightWelcome.xaml index a35b61a..467cbd2 100644 --- a/MoonlightWelcome.xaml +++ b/MoonlightWelcome.xaml @@ -14,11 +14,15 @@ Welcome to Moonlight Moonlight allows your Xbox to control and stream your Computer! - + - Servers To make Moonlight work, you need a Server, you can use one of the following ones: @@ -35,16 +39,25 @@ Nvidia Geforce Experience (DEPRECATED) GFE is still compatible with Moonlight, but it may be removed soon from your system - + - - + + - Hints @@ -67,59 +80,44 @@ Is your screen a quarter of its size? Change the global composition scale inside the Global Settings of the App - - + + - Support Need some Help? - - - - - - - - - - - - - Moonlight Wiki - Access the Documentation of The Moonlight Project - https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide - - - - - - Moonlight Discord - Need general support for Moonlight? - https://moonlight-stream.org/discord - - - - - - LizardByte Discord - Need help with Sunshine? - https://app.lizardbyte.dev/discord - + + + + GitHub + Check the Wiki for Support Links, documentation and more! + https://github.com/TheElixZammuto/moonlight-xbox/wiki - - - - GitHub - Want to file an issue with this version of Moonlight? - https://github.com/TheElixZammuto/moonlight-xbox - - - + - - + + diff --git a/MoonlightWelcome.xaml.cpp b/MoonlightWelcome.xaml.cpp index 3e9c845..50ceed9 100644 --- a/MoonlightWelcome.xaml.cpp +++ b/MoonlightWelcome.xaml.cpp @@ -26,6 +26,7 @@ MoonlightWelcome::MoonlightWelcome() InitializeComponent(); auto navigation = Windows::UI::Core::SystemNavigationManager::GetForCurrentView(); navigation->BackRequested += ref new EventHandler(this, &MoonlightWelcome::OnBackRequested); + Windows::UI::ViewManagement::ApplicationView::GetForCurrentView()->SetDesiredBoundsMode(Windows::UI::ViewManagement::ApplicationViewBoundsMode::UseVisible); } void moonlight_xbox_dx::MoonlightWelcome::OnBackRequested(Platform::Object^ e, Windows::UI::Core::BackRequestedEventArgs^ args) @@ -34,12 +35,14 @@ void moonlight_xbox_dx::MoonlightWelcome::OnBackRequested(Platform::Object^ e, W // button is pressed which can result in the app being // suspended if unhandled if (this->FlipView->SelectedIndex > 0) { + args->Handled = true; this->FlipView->SelectedIndex = this->FlipView->SelectedIndex - 1; return; } if (this->Frame->CanGoBack && !GetApplicationState()->FirstTime) { this->Frame->GoBack(); args->Handled = true; + return; } } diff --git a/Pages/MoonlightSettings.xaml b/Pages/MoonlightSettings.xaml index 4e38633..2306128 100644 --- a/Pages/MoonlightSettings.xaml +++ b/Pages/MoonlightSettings.xaml @@ -38,7 +38,7 @@ Change these parameters until you can see a green border around the screen Mouse Sensitivity: - + diff --git a/moonlight-xbox-dx.vcxproj b/moonlight-xbox-dx.vcxproj index 554c9c9..09c7c55 100644 --- a/moonlight-xbox-dx.vcxproj +++ b/moonlight-xbox-dx.vcxproj @@ -435,16 +435,7 @@ true - - true - - - true - - - true - - + true