Browse Source

Revert Maximized = Fullscreen changes, fixes #20

Evan Husted 1 year ago
parent
commit
509f6d738c

+ 6 - 0
.github/workflows/release.yml

@@ -33,6 +33,7 @@ jobs:
         id: version_info
         run: |
           echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
         shell: bash
 
       - name: Create tag
@@ -51,6 +52,7 @@ jobs:
         with:
           name: ${{ steps.version_info.outputs.build_version }}
           tag: ${{ steps.version_info.outputs.build_version }}
+          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
           omitBodyDuringUpdate: true
           owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
           repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@@ -79,6 +81,7 @@ jobs:
         id: version_info
         run: |
           echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
           echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
         shell: bash
 
@@ -132,6 +135,7 @@ jobs:
           name: ${{ steps.version_info.outputs.build_version }}
           artifacts: "release_output/*.tar.gz,release_output/*.zip"
           tag: ${{ steps.version_info.outputs.build_version }}
+          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true
@@ -170,6 +174,7 @@ jobs:
         id: version_info
         run: |
           echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
+          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
           echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
 
       - name: Configure for release
@@ -196,6 +201,7 @@ jobs:
           name: ${{ steps.version_info.outputs.build_version }}
           artifacts: "publish_ava/*.tar.gz, publish_headless/*.tar.gz"
           tag: ${{ steps.version_info.outputs.build_version }}
+          body: "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}"
           omitBodyDuringUpdate: true
           allowUpdates: true
           replacesArtifacts: true

+ 3 - 3
src/Ryujinx/AppHost.cs

@@ -964,10 +964,10 @@ namespace Ryujinx.Ava
             {
                 if (_viewModel.StartGamesInFullscreen)
                 {
-                    _viewModel.WindowState = MainWindow.FullScreenWindowState;
+                    _viewModel.WindowState = WindowState.FullScreen;
                 }
 
-                if (_viewModel.WindowState == MainWindow.FullScreenWindowState)
+                if (_viewModel.WindowState is WindowState.FullScreen)
                 {
                     _viewModel.ShowMenuAndStatusBar = false;
                 }
@@ -1138,7 +1138,7 @@ namespace Ryujinx.Ava
 
                 Dispatcher.UIThread.Post(() =>
                 {
-                    if (_keyboardInterface.GetKeyboardStateSnapshot().IsPressed(Key.Delete) && _viewModel.WindowState != MainWindow.FullScreenWindowState)
+                    if (_keyboardInterface.GetKeyboardStateSnapshot().IsPressed(Key.Delete) && _viewModel.WindowState is not WindowState.FullScreen)
                     {
                         Device.Processes.ActiveApplication.DiskCacheLoadState?.Cancel();
                     }

+ 3 - 3
src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -1426,7 +1426,7 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public async Task ExitCurrentState()
         {
-            if (WindowState == MainWindow.FullScreenWindowState)
+            if (WindowState is WindowState.FullScreen)
             {
                 ToggleFullscreen();
             }
@@ -1754,7 +1754,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
             else
             {
-                WindowState = MainWindow.FullScreenWindowState;
+                WindowState = WindowState.FullScreen;
 
                 if (IsGameRunning)
                 {
@@ -1762,7 +1762,7 @@ namespace Ryujinx.Ava.UI.ViewModels
                 }
             }
 
-            IsFullScreen = WindowState == MainWindow.FullScreenWindowState;
+            IsFullScreen = WindowState is WindowState.FullScreen;
         }
 
         public static void SaveConfig()

+ 2 - 10
src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -67,14 +67,6 @@ namespace Ryujinx.Ava.UI.Windows
         public readonly double StatusBarHeight;
         public readonly double MenuBarHeight;
 
-        // The special window decoration from AppWindow in FluentAvalonia is only present on Windows;
-        // and as such optimizing for the fact that the menu bar and the title bar are the same is only needed on Windows.
-        // Maximized is considered superior to FullScreen on Windows in this case because you get the benefits of being in full screen,
-        // while still being able to use the standard 3 window controls in the top right to minimize, make the window smaller, or close the app.
-
-        public static readonly WindowState FullScreenWindowState =
-            OperatingSystem.IsWindows() ? WindowState.Maximized : WindowState.FullScreen;
-
         public MainWindow()
         {
             DataContext = ViewModel = new MainWindowViewModel
@@ -193,7 +185,7 @@ namespace Ryujinx.Ava.UI.Windows
             ViewModel.ShowContent = true;
             ViewModel.IsLoadingIndeterminate = false;
 
-            if (startFullscreen && ViewModel.WindowState != MainWindow.FullScreenWindowState)
+            if (startFullscreen && ViewModel.WindowState is not WindowState.FullScreen)
             {
                 ViewModel.ToggleFullscreen();
             }
@@ -205,7 +197,7 @@ namespace Ryujinx.Ava.UI.Windows
             ViewModel.ShowLoadProgress = true;
             ViewModel.IsLoadingIndeterminate = true;
 
-            if (startFullscreen && ViewModel.WindowState != MainWindow.FullScreenWindowState)
+            if (startFullscreen && ViewModel.WindowState is not WindowState.FullScreen)
             {
                 ViewModel.ToggleFullscreen();
             }