Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/UniGetUI.Avalonia/Assets/Images/Trophee.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file added src/UniGetUI.Avalonia/Assets/Images/launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/UniGetUI.Avalonia/Assets/Images/relax.png
Binary file not shown.
36 changes: 36 additions & 0 deletions src/UniGetUI.Avalonia/Converters/ScaleClampConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System;
using System.Globalization;
using Avalonia.Data.Converters;

namespace UniGetUI.Avalonia.Converters;

/// <summary>
/// Multiplies a bound double (typically a container dimension) by a fraction and clamps the
/// result to an upper bound, so an element can scale down with its container yet never grow
/// past a sensible maximum. The converter parameter is "fraction|max" (e.g. "0.5|240").
/// </summary>
public sealed class ScaleClampConverter : IValueConverter
{
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
{
if (value is not double available || double.IsNaN(available) || available <= 0)
return 0.0;

double fraction = 1.0;
double max = double.PositiveInfinity;

if (parameter is string param)
{
string[] parts = param.Split('|');
if (parts.Length > 0 && double.TryParse(parts[0], NumberStyles.Float, CultureInfo.InvariantCulture, out double f))
fraction = f;
if (parts.Length > 1 && double.TryParse(parts[1], NumberStyles.Float, CultureInfo.InvariantCulture, out double m))
max = m;
}

return Math.Min(available * fraction, max);
}

public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
=> throw new NotSupportedException();
}
5 changes: 3 additions & 2 deletions src/UniGetUI.Avalonia/UniGetUI.Avalonia.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -179,9 +179,10 @@
<AvaloniaResource Include="..\SharedAssets\Assets\Images\icon.png" Link="Assets\icon.png" />
<AvaloniaResource Include="..\SharedAssets\Assets\Images\icon_unsquare.png" Link="Assets\icon_unsquare.png" />
<AvaloniaResource Include="..\SharedAssets\Assets\Images\package_color.png" Link="Assets\package_color.png" />
<AvaloniaResource Include="Assets\Images\jetpack_Maurice2-blue.png" />
<AvaloniaResource Include="Assets\Images\relax.png" />
<AvaloniaResource Include="Assets\Images\maurice_penseur.png" />
<AvaloniaResource Include="Assets\Images\launcher.png" />
<AvaloniaResource Include="Assets\Images\Trophee.png" />
<AvaloniaResource Include="Assets\Images\Empty_inbox.png" />
<AvaloniaResource Include="..\SharedAssets\Assets\SplashScreen.png" Link="Assets\SplashScreen.png" />
<AvaloniaResource Include="..\SharedAssets\Assets\SplashScreen.theme-dark.png" Link="Assets\SplashScreen.theme-dark.png" />
<!-- Tray status icon variants: status colour encoded by the corner dot; light/dark tone per taskbar theme. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:peers="clr-namespace:Avalonia.Automation.Peers;assembly=Avalonia.Controls"
xmlns:vm="using:UniGetUI.Avalonia.ViewModels.Pages"
xmlns:controls="using:UniGetUI.Avalonia.Views.Controls"
xmlns:conv="using:UniGetUI.Avalonia.Converters"
xmlns:pkg="using:UniGetUI.PackageEngine.PackageClasses"
xmlns:t="using:UniGetUI.Avalonia.MarkupExtensions"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand Down Expand Up @@ -91,6 +92,10 @@
</Style>
</UserControl.Styles>

<UserControl.Resources>
<conv:ScaleClampConverter x:Key="ScaleClampConverter"/>
</UserControl.Resources>

<Grid RowDefinitions="Auto,Auto,*,Auto" Margin="8,6,8,8">

<!-- ==================== HEADER ==================== -->
Expand Down Expand Up @@ -484,7 +489,7 @@
</Border>

<!-- Package list (list/grid/icons views) -->
<Panel Grid.Row="1">
<Panel Grid.Row="1" x:Name="PackageListHost">
<DataGrid x:Name="PackageList"
IsVisible="{Binding IsListViewMode}"
HorizontalAlignment="Stretch"
Expand Down Expand Up @@ -802,13 +807,15 @@
<StackPanel VerticalAlignment="Center"
HorizontalAlignment="Center"
Spacing="16">
<Image Source="avares://UniGetUI/Assets/Images/jetpack_Maurice2-blue.png"
Width="360"
<Image Source="avares://UniGetUI/Assets/Images/launcher.png"
MaxWidth="{Binding #PackageListHost.Bounds.Width, Converter={StaticResource ScaleClampConverter}, ConverterParameter=0.4|180}"
MaxHeight="{Binding #PackageListHost.Bounds.Height, Converter={StaticResource ScaleClampConverter}, ConverterParameter=0.4|180}"
Stretch="Uniform"
HorizontalAlignment="Center"
IsVisible="{Binding LoadingImageVisible}"/>
<Image Source="{Binding NoPackagesImage}"
Width="260"
MaxWidth="{Binding #PackageListHost.Bounds.Width, Converter={StaticResource ScaleClampConverter}, ConverterParameter=0.4|180}"
MaxHeight="{Binding #PackageListHost.Bounds.Height, Converter={StaticResource ScaleClampConverter}, ConverterParameter=0.4|180}"
Stretch="Uniform"
HorizontalAlignment="Center"
IsVisible="{Binding NoPackagesImageVisible}"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public PackageBundlesPage() : base(new PackagesPageData
DisableFilterOnQueryChange = false,
DisableReload = true,
NoPackages_BackgroundText = CoreTools.Translate("Add packages or open an existing package bundle"),
NoPackages_ImagePath = "avares://UniGetUI/Assets/Images/maurice_penseur.png",
NoPackages_ImagePath = "avares://UniGetUI/Assets/Images/Empty_inbox.png",
NoPackages_SourcesText = CoreTools.Translate("Add packages to start"),
NoPackages_SubtitleText_Base = CoreTools.Translate("The current bundle has no packages. Add some packages to get started"),
MainSubtitle_StillLoading = CoreTools.Translate("Loading packages"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public SoftwareUpdatesPage() : base(new PackagesPageData
DisableFilterOnQueryChange = false,
DisableReload = false,
NoPackages_BackgroundText = CoreTools.Translate("Hooray! No updates were found."),
NoPackages_ImagePath = "avares://UniGetUI/Assets/Images/relax.png",
NoPackages_ImagePath = "avares://UniGetUI/Assets/Images/Trophee.png",
NoPackages_SourcesText = CoreTools.Translate("Everything is up to date"),
NoPackages_SubtitleText_Base = CoreTools.Translate("Everything is up to date"),
MainSubtitle_StillLoading = CoreTools.Translate("Loading packages"),
Expand Down
Loading