MeloNX/Ryujinx-ryubing
10
0
Fork 0
Code Issues 184 Pull Requests 15 Actions Packages Projects Releases 36 Wiki Activity

UI: More advanced IsVisible binding for update available button (idk why it's always showing)

Browse Source
This commit is contained in:
Evan Husted 2025-02-10 22:42:25 -06:00
parent aab9b58542
commit a205ec374b
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ryujinx/UI/Views/Main/MainStatusBarView.axaml
View File

@ -283,10 +283,14 @@
<StackPanel <StackPanel
Grid.Column="4" Grid.Column="4"
Margin="0,0,5,0" Margin="0,0,5,0"
IsVisible="{Binding EnableNonGameRunningControls}"
Orientation="Horizontal"> Orientation="Horizontal">
<StackPanel.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="EnableNonGameRunningControls" />
<Binding Path="UpdateAvailable" />
</MultiBinding>
</StackPanel.IsVisible>
<Button Margin="0, 0, 5, 0" <Button Margin="0, 0, 5, 0"
IsVisible="{Binding UpdateAvailable}"
Command="{Binding UpdateCommand}"> Command="{Binding UpdateCommand}">
<TextBlock <TextBlock
Margin="-5" Margin="-5"
@ -294,7 +298,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{ext:Locale UpdaterBackgroundStatusBarButtonText}" /> Text="{ext:Locale UpdaterBackgroundStatusBarButtonText}" />
</Button> </Button>
<controls:MiniVerticalSeparator IsVisible="{Binding UpdateAvailable}" /> <controls:MiniVerticalSeparator Margin="5,0,0,0"/>
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Column="5" Grid.Column="5"

3
src/Ryujinx/UI/Windows/MainWindow.axaml.cs
View File

@ -413,8 +413,7 @@ namespace Ryujinx.Ava.UI.Windows
case UpdaterType.CheckInBackground: case UpdaterType.CheckInBackground:
if ((await Updater.CheckVersionAsync()).TryGet(out (Version Current, Version Incoming) versions)) if ((await Updater.CheckVersionAsync()).TryGet(out (Version Current, Version Incoming) versions))
{ {
if (versions.Current < versions.Incoming) Dispatcher.UIThread.Post(() => RyujinxApp.MainWindow.ViewModel.UpdateAvailable = versions.Current < versions.Incoming);
Dispatcher.UIThread.Post(() => RyujinxApp.MainWindow.ViewModel.UpdateAvailable = true);
} }
break; break;
} }

8
src/Ryujinx/Updater.cs
View File

@ -163,7 +163,7 @@ namespace Ryujinx.Ava
_running = false; _running = false;
return (currentVersion, null); return default;
} }
return (currentVersion, newVersion); return (currentVersion, newVersion);
@ -178,7 +178,11 @@ namespace Ryujinx.Ava
_running = true; _running = true;
(Version currentVersion, Version newVersion) = (await CheckVersionAsync(showVersionUpToDate)).OrDefault(); Optional<(Version, Version)> versionTuple = await CheckVersionAsync(showVersionUpToDate);
if (_running is false || !versionTuple.HasValue) return;
(Version currentVersion, Version newVersion) = versionTuple.Value;
if (newVersion <= currentVersion) if (newVersion <= currentVersion)
{ {