From 930b460e565f64964f745cbbf0b6f8d98b399dfc Mon Sep 17 00:00:00 2001
From: Sebastien Duquette <sduquette@fastmail.com>
Date: Fri, 9 Oct 2026 17:11:06 -0400
Subject: [PATCH 1/2] Adjust the catalog section to follow the standard style

---
 .../Assets/Styles/Styles.Common.axaml         |  33 ++++
 .../SoftwarePages/SoftwareCatalogViewModel.cs |  32 +++-
 .../SoftwarePages/AbstractPackagesPage.axaml  |  32 ----
 .../SoftwarePages/SoftwareCatalogPage.axaml   | 151 ++++++++++++++----
 .../SoftwareCatalogPage.axaml.cs              |  48 ++++++
 5 files changed, 231 insertions(+), 65 deletions(-)

diff --git a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
index 00e7acbae2..b001dc1cc8 100644
--- a/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
+++ b/src/UniGetUI.Avalonia/Assets/Styles/Styles.Common.axaml
@@ -495,6 +495,39 @@
         <Setter Property="Foreground" Value="{DynamicResource AccentTextFillColorTertiaryBrush}"/>
     </Style>
 
+    <!-- Filter-pane drag handle. The full splitter track is interactive; its subtle rounded hover
+         surface sits beneath the persistent grip, matching WinUI's pane-resize affordance. -->
+    <Style Selector="GridSplitter.winui-vertical-splitter">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Transitions">
+            <Transitions>
+                <BrushTransition Property="Background" Duration="0:0:0.083"/>
+            </Transitions>
+        </Setter>
+        <Setter Property="Template">
+            <ControlTemplate>
+                <!-- Match the visible splitter track to the package-list container on the
+                     right, whose outer card is inset 6 DIPs vertically. -->
+                <Border Background="{TemplateBinding Background}"
+                        Margin="0,6"
+                        CornerRadius="6">
+                    <Border Width="4" Height="22"
+                            CornerRadius="2"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Background="{DynamicResource TextFillColorTertiaryBrush}"
+                            IsHitTestVisible="False"/>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </Style>
+    <Style Selector="GridSplitter.winui-vertical-splitter:pointerover">
+        <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
+    </Style>
+    <Style Selector="GridSplitter.winui-vertical-splitter:pressed">
+        <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
+    </Style>
+
     <!-- Standard non-accent action button. Keep this semantic style separate from the
          framework's default Button so icon, toolbar, dialog, and accent buttons retain
          their purpose-specific appearances. Reusable controls such as ButtonCard opt in
diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
index a8bdb75d03..961bcd9693 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
@@ -40,6 +40,25 @@ public partial class SoftwareCatalogViewModel : ViewModelBase
     [ObservableProperty]
     private bool _isFilterPaneOpen;
 
+    // Live width of the filter pane, kept in sync by the page so the toolbar's Filters button
+    // reserves the pane's width and the remaining buttons align with the package list.
+    private double _trackedFilterPaneWidth = 220.0;
+    public double TrackedFilterPaneWidth
+    {
+        get => _trackedFilterPaneWidth;
+        set
+        {
+            if (Math.Abs(_trackedFilterPaneWidth - value) < 0.5) return;
+            _trackedFilterPaneWidth = value;
+            if (IsFilterPaneOpen) OnPropertyChanged(nameof(FilterPaneColumnWidth));
+        }
+    }
+
+    public double FilterPaneColumnWidth => IsFilterPaneOpen ? _trackedFilterPaneWidth : 0.0;
+
+    partial void OnIsFilterPaneOpenChanged(bool value) =>
+        OnPropertyChanged(nameof(FilterPaneColumnWidth));
+
     [ObservableProperty]
     private SearchMode _searchMode = SearchMode.Both;
 
@@ -84,14 +103,19 @@ public bool HasHiddenPackages
                 && MatchesQuery(p.Entry, query));
         }
     }
-    public string PackageCountText => CoreTools.Translate("{0} packages found", Packages.Count);
     public string EmptyMessage => CoreTools.Translate(_allPackages.Count > 0
         ? "No packages are available with the current filters."
         : "This catalog contains no packages.");
 
     public bool IsEmpty => !IsLoading && !HasError && Packages.Count == 0;
 
-    partial void OnIsLoadingChanged(bool value) => OnPropertyChanged(nameof(IsEmpty));
+    public bool HasStatusMessage => IsLoading || HasError || IsEmpty || HasHiddenPackages;
+
+    partial void OnIsLoadingChanged(bool value)
+    {
+        OnPropertyChanged(nameof(IsEmpty));
+        OnPropertyChanged(nameof(HasStatusMessage));
+    }
 
     partial void OnSelectedCatalogChanged(CatalogDefinition? value)
     {
@@ -110,6 +134,7 @@ partial void OnSelectedCatalogChanged(CatalogDefinition? value)
         }
         UpdateStates();
         OnPropertyChanged(nameof(IsEmpty));
+        OnPropertyChanged(nameof(HasStatusMessage));
     }
 
     [ObservableProperty]
@@ -124,6 +149,7 @@ partial void OnErrorMessageChanged(string value)
     {
         OnPropertyChanged(nameof(HasError));
         OnPropertyChanged(nameof(IsEmpty));
+        OnPropertyChanged(nameof(HasStatusMessage));
         if (value.Length > 0)
             Avalonia.Infrastructure.AccessibilityAnnouncementService.Announce(
                 value, global::Avalonia.Automation.AutomationLiveSetting.Assertive);
@@ -333,7 +359,7 @@ internal void ApplyAvailabilityFilter()
         OnPropertyChanged(nameof(HasHiddenPackages));
         OnPropertyChanged(nameof(EmptyMessage));
         OnPropertyChanged(nameof(IsEmpty));
-        OnPropertyChanged(nameof(PackageCountText));
+        OnPropertyChanged(nameof(HasStatusMessage));
     }
 
     private bool MatchesQuery(CatalogEntry entry, string query) => query.Length == 0 || SearchMode switch
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
index 21a5e19b4f..7ab7fe8607 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/AbstractPackagesPage.axaml
@@ -149,38 +149,6 @@
          <Setter Property="Background" Value="{DynamicResource SearchBoxFocusedBackground}"/>
          <Setter Property="BorderBrush" Value="{DynamicResource SearchBoxFocusedBorderBrush}"/>
       </Style>
-      <!-- The full splitter track is interactive. Its subtle rounded hover surface sits beneath
-           the persistent grip, matching WinUI's pane-resize affordance. -->
-      <Style Selector="GridSplitter.winui-vertical-splitter">
-         <Setter Property="Background" Value="Transparent"/>
-         <Setter Property="Transitions">
-            <Transitions>
-               <BrushTransition Property="Background" Duration="0:0:0.083"/>
-            </Transitions>
-         </Setter>
-         <Setter Property="Template">
-            <ControlTemplate>
-               <!-- Match the visible splitter track to the package-list container on the
-                    right, whose outer card is inset 6 DIPs vertically. -->
-               <Border Background="{TemplateBinding Background}"
-                       Margin="0,6"
-                       CornerRadius="6">
-                  <Border Width="4" Height="22"
-                          CornerRadius="2"
-                          HorizontalAlignment="Center"
-                          VerticalAlignment="Center"
-                          Background="{DynamicResource TextFillColorTertiaryBrush}"
-                          IsHitTestVisible="False"/>
-               </Border>
-            </ControlTemplate>
-         </Setter>
-      </Style>
-      <Style Selector="GridSplitter.winui-vertical-splitter:pointerover">
-         <Setter Property="Background" Value="{DynamicResource SubtleFillColorSecondaryBrush}"/>
-      </Style>
-      <Style Selector="GridSplitter.winui-vertical-splitter:pressed">
-         <Setter Property="Background" Value="{DynamicResource SubtleFillColorTertiaryBrush}"/>
-      </Style>
    </UserControl.Styles>
 
    <UserControl.Resources>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
index 73579cf2e3..63dc60051b 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
@@ -25,16 +25,61 @@
             <Setter Property="MinHeight" Value="44"/>
             <Setter Property="BorderThickness" Value="0"/>
         </Style>
-        <Style Selector="Expander.catalog-filter-expander">
+        <Style Selector="Expander /template/ ToggleButton#ExpanderHeader">
+            <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+        </Style>
+        <Style Selector="Expander.filter-pane-expander">
             <Setter Property="MinWidth" Value="0"/>
             <Setter Property="HorizontalAlignment" Value="Stretch"/>
             <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-            <Setter Property="CornerRadius" Value="8"/>
-            <Setter Property="Padding" Value="16,8"/>
-            <Setter Property="Background" Value="{DynamicResource SettingsCardBackground}"/>
+        </Style>
+        <Style Selector="RadioButton.filter-radio">
+            <Setter Property="HorizontalAlignment" Value="Stretch"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+            <Setter Property="MinHeight" Value="30"/>
+        </Style>
+        <Style Selector="RadioButton.filter-radio /template/ ContentPresenter#PART_ContentPresenter">
+            <Setter Property="TextWrapping" Value="Wrap"/>
         </Style>
     </UserControl.Styles>
     <UserControl.Resources>
+        <ResourceDictionary>
+            <SolidColorBrush x:Key="ExpanderChevronBackground" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBackgroundDisabled" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBorderBrush" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBorderBrushPointerOver" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBorderBrushPressed" Color="Transparent"/>
+            <SolidColorBrush x:Key="ExpanderChevronBorderBrushDisabled" Color="Transparent"/>
+            <ResourceDictionary.ThemeDictionaries>
+                <ResourceDictionary x:Key="Light">
+                    <SolidColorBrush x:Key="FilterPaneOutlineBrush" Color="#ECECEC"/>
+                    <SolidColorBrush x:Key="FilterExpanderContentBackground" Color="#06000000"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="#B3FFFFFF"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed" Color="#B3FFFFFF"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBackgroundDisabled" Color="#B3FFFFFF"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPressed" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBorderBrushDisabled" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ExpanderContentBorderBrush" Color="#0F000000"/>
+                    <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="#09000000"/>
+                    <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="#06000000"/>
+                </ResourceDictionary>
+                <ResourceDictionary x:Key="Dark">
+                    <SolidColorBrush x:Key="FilterPaneOutlineBrush" Color="#393939"/>
+                    <SolidColorBrush x:Key="FilterExpanderContentBackground" Color="#08FFFFFF"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBackgroundPointerOver" Color="#0DFFFFFF"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBackgroundPressed" Color="#0DFFFFFF"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBackgroundDisabled" Color="#0DFFFFFF"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBorderBrush" Color="#19000000"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPointerOver" Color="#19000000"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBorderBrushPressed" Color="#19000000"/>
+                    <SolidColorBrush x:Key="ExpanderHeaderBorderBrushDisabled" Color="#19000000"/>
+                    <SolidColorBrush x:Key="ExpanderContentBorderBrush" Color="#19000000"/>
+                    <SolidColorBrush x:Key="ExpanderChevronBackgroundPointerOver" Color="#0FFFFFFF"/>
+                    <SolidColorBrush x:Key="ExpanderChevronBackgroundPressed" Color="#0AFFFFFF"/>
+                </ResourceDictionary>
+            </ResourceDictionary.ThemeDictionaries>
         <DataTemplate x:Key="CatalogSmallIcon" x:DataType="vm:CatalogTileViewModel">
             <Panel Width="24" Height="24" Opacity="{Binding TitleOpacity}">
                 <Image Source="{Binding IconBitmap}" IsVisible="{Binding HasCustomIcon}" Stretch="Uniform"
@@ -54,22 +99,46 @@
                            FontWeight="SemiBold" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,8"/>
             </Panel>
         </DataTemplate>
+        </ResourceDictionary>
     </UserControl.Resources>
-    <Grid RowDefinitions="Auto,Auto,Auto,*,Auto" Margin="24" RowSpacing="12">
-        <StackPanel Spacing="6">
-            <TextBlock Text="{t:Translate Software Catalog}" FontSize="28" FontWeight="SemiBold"/>
-            <TextBlock Text="{t:Translate Text='Software selected for you, ready to install.'}"
-                       Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
-        </StackPanel>
+    <Grid RowDefinitions="Auto,Auto,Auto,*,Auto" Margin="8,6,8,8">
+        <Grid Name="MainHeader" ColumnDefinitions="80,*" ColumnSpacing="8" Margin="0,0,0,8">
+            <controls:SvgIcon Grid.Column="0"
+                              Width="40" Height="40"
+                              Margin="0,0,4,0"
+                              automation:AutomationProperties.AccessibilityView="Raw"
+                              VerticalAlignment="Center" HorizontalAlignment="Center"
+                              Path="avares://UniGetUI/Assets/Symbols/catalog.svg"/>
+            <StackPanel Grid.Column="1" VerticalAlignment="Center" Spacing="0">
+                <TextBlock Text="{t:Translate Software Catalog}"
+                           HorizontalAlignment="Left"
+                           FontSize="28"
+                           FontWeight="SemiBold"
+                           FontFamily="Segoe UI Variable Display"
+                           TextWrapping="Wrap"/>
+                <TextBlock Text="{t:Translate Text='Software selected for you, ready to install.'}"
+                           HorizontalAlignment="Left"
+                           FontSize="12"
+                           FontWeight="Normal"
+                           Opacity="0.6"
+                           TextWrapping="Wrap"/>
+            </StackPanel>
+        </Grid>
         <Grid Grid.Row="1" Name="CatalogToolbar" ColumnDefinitions="Auto,*" ColumnSpacing="4">
-            <StackPanel Margin="0,0,8,0">
-                <ToggleButton IsChecked="{Binding IsFilterPaneOpen, Mode=TwoWay}" Height="40"
+            <StackPanel Margin="0,0,8,0" MinWidth="{Binding FilterPaneColumnWidth}">
+                <StackPanel.Transitions>
+                    <Transitions>
+                        <DoubleTransition Property="MinWidth" Duration="0:0:0.2" Easing="CubicEaseOut"/>
+                    </Transitions>
+                </StackPanel.Transitions>
+                <ToggleButton Classes="filter-toggle"
+                              IsChecked="{Binding IsFilterPaneOpen, Mode=TwoWay}" Height="40"
                               Padding="10,4" CornerRadius="4" HorizontalAlignment="Left"
                               ToolTip.Tip="{t:Translate Filters}" automation:AutomationProperties.Name="{t:Translate Filters}">
                     <StackPanel Orientation="Horizontal" Spacing="6">
                         <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/Filter.svg"
                                           Width="20" Height="20" VerticalAlignment="Center"/>
-                        <TextBlock Text="{t:Translate Filters}" FontSize="12" VerticalAlignment="Center"/>
+                        <TextBlock Text="{t:Translate Filters}" FontSize="12" FontWeight="Medium" VerticalAlignment="Center"/>
                     </StackPanel>
                 </ToggleButton>
             </StackPanel>
@@ -93,7 +162,7 @@
                 </ComboBox>
             </StackPanel>
         </Grid>
-        <StackPanel Grid.Row="2" Spacing="8">
+        <StackPanel Grid.Row="2" Spacing="8" Margin="0,4,0,8" IsVisible="{Binding HasStatusMessage}">
             <ProgressBar IsIndeterminate="True" IsVisible="{Binding IsLoading}" Height="3"/>
             <TextBlock Text="{Binding ErrorMessage}" IsVisible="{Binding HasError}" TextWrapping="Wrap"
                        Foreground="{DynamicResource SystemFillColorCriticalBrush}"/>
@@ -101,11 +170,21 @@
             <TextBlock Text="{t:Translate Packages with unavailable sources are hidden. Change Filters to show them.}"
                        IsVisible="{Binding HasHiddenPackages}" TextWrapping="Wrap"/>
         </StackPanel>
-        <Grid Grid.Row="3" ColumnDefinitions="Auto,*">
-            <ScrollViewer IsVisible="{Binding IsFilterPaneOpen}" Width="260" Margin="0,0,16,0"
-                          HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
-                <StackPanel Spacing="10">
-                <Expander Classes="catalog-filter-expander" IsExpanded="True">
+        <Grid Grid.Row="3" Name="FilteringPanel" ColumnDefinitions="220,12,*">
+            <Border x:Name="InlineSidePanel"
+                    Grid.Column="0"
+                    BorderBrush="{DynamicResource FilterPaneOutlineBrush}"
+                    CornerRadius="8"
+                    ClipToBounds="True"
+                    IsVisible="{Binding IsFilterPaneOpen}">
+                <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"
+                              HorizontalContentAlignment="Left" VerticalContentAlignment="Top"
+                              Background="{DynamicResource MicaPageBackground}">
+                <Border Padding="4,3,4,4" VerticalAlignment="Top">
+                <StackPanel Spacing="8">
+                <Expander Classes="filter-pane-expander" IsExpanded="True"
+                          CornerRadius="8" Padding="16,8,16,8"
+                          Background="{DynamicResource FilterExpanderContentBackground}">
                     <Expander.Header>
                         <StackPanel Orientation="Horizontal" Spacing="8">
                             <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/Sources.svg"
@@ -153,7 +232,9 @@
                         </ItemsControl>
                     </StackPanel>
                 </Expander>
-                <Expander Classes="catalog-filter-expander" IsExpanded="True">
+                <Expander Classes="filter-pane-expander" IsExpanded="True"
+                          CornerRadius="8" Padding="16,8,16,8"
+                          Background="{DynamicResource FilterExpanderContentBackground}">
                     <Expander.Header>
                         <StackPanel Orientation="Horizontal" Spacing="8">
                             <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/Filter.svg"
@@ -166,7 +247,9 @@
                         <TextBlock Text="{t:Translate Hide packages with unavailable sources}" TextWrapping="Wrap"/>
                     </CheckBox>
                 </Expander>
-                <Expander Classes="catalog-filter-expander" IsExpanded="True">
+                <Expander Classes="filter-pane-expander" IsExpanded="True"
+                          CornerRadius="8" Padding="16,8,16,8"
+                          Background="{DynamicResource FilterExpanderContentBackground}">
                     <Expander.Header>
                         <StackPanel Orientation="Horizontal" Spacing="8">
                             <controls:SvgIcon Path="avares://UniGetUI/Assets/Symbols/search_filled.svg"
@@ -175,23 +258,32 @@
                         </StackPanel>
                     </Expander.Header>
                     <StackPanel>
-                        <RadioButton GroupName="CatalogSearchMode" IsChecked="{Binding SearchMode_Name, Mode=TwoWay}"
+                        <RadioButton Classes="filter-radio" GroupName="CatalogSearchMode" IsChecked="{Binding SearchMode_Name, Mode=TwoWay}"
                                      Content="{t:Translate Package Name}"
                                      automation:AutomationProperties.Name="{t:Translate Package Name}"/>
-                        <RadioButton GroupName="CatalogSearchMode" IsChecked="{Binding SearchMode_Id, Mode=TwoWay}"
+                        <RadioButton Classes="filter-radio" GroupName="CatalogSearchMode" IsChecked="{Binding SearchMode_Id, Mode=TwoWay}"
                                      Content="{t:Translate Package ID}"
                                      automation:AutomationProperties.Name="{t:Translate Package ID}"/>
-                        <RadioButton GroupName="CatalogSearchMode" IsChecked="{Binding SearchMode_Both, Mode=TwoWay}"
+                        <RadioButton Classes="filter-radio" GroupName="CatalogSearchMode" IsChecked="{Binding SearchMode_Both, Mode=TwoWay}"
                                      Content="{t:Translate Both}"
                                      automation:AutomationProperties.Name="{t:Translate Both}"/>
-                        <RadioButton GroupName="CatalogSearchMode" IsChecked="{Binding SearchMode_Exact, Mode=TwoWay}"
+                        <RadioButton Classes="filter-radio" GroupName="CatalogSearchMode" IsChecked="{Binding SearchMode_Exact, Mode=TwoWay}"
                                      Content="{t:Translate Exact match}"
                                      automation:AutomationProperties.Name="{t:Translate Exact match}"/>
                     </StackPanel>
                 </Expander>
                 </StackPanel>
-            </ScrollViewer>
-            <Panel Grid.Column="1">
+                </Border>
+                </ScrollViewer>
+            </Border>
+            <GridSplitter x:Name="FilterSplitter"
+                          Classes="winui-vertical-splitter"
+                          Grid.Column="1"
+                          Margin="0,0,2,0"
+                          IsVisible="{Binding IsFilterPaneOpen}"
+                          HorizontalAlignment="Stretch"
+                          ResizeDirection="Columns"/>
+            <Panel Grid.Column="2" Margin="0,6,0,0">
                 <ScrollViewer IsVisible="{Binding IsTilesView}" HorizontalScrollBarVisibility="Disabled">
                     <ItemsControl ItemsSource="{Binding Packages}">
                         <ItemsControl.ItemsPanel>
@@ -340,9 +432,8 @@
                 </ScrollViewer>
             </Panel>
         </Grid>
-        <Grid Grid.Row="4" ColumnDefinitions="*,Auto" Margin="0,4">
-            <TextBlock Text="{Binding PackageCountText}" VerticalAlignment="Center"/>
-            <ListBox Grid.Column="1" SelectionMode="Single" SelectedIndex="{Binding ViewModeIndex, Mode=TwoWay}"
+        <Grid Grid.Row="4" Margin="0,4" HorizontalAlignment="Right">
+            <ListBox SelectionMode="Single" SelectedIndex="{Binding ViewModeIndex, Mode=TwoWay}"
                      Background="Transparent" BorderThickness="1" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}"
                      CornerRadius="4" Padding="0" automation:AutomationProperties.Name="{t:Translate View modes}">
                 <ListBox.ItemsPanel>
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml.cs b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml.cs
index 3b26bef9f8..c5049ad177 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml.cs
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml.cs
@@ -1,6 +1,10 @@
+using System.ComponentModel;
+using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Threading;
+using UniGetUI.Avalonia.Extensions;
 using UniGetUI.Avalonia.ViewModels.Pages;
+using UniGetUI.Core.SettingsEngine;
 using UniGetUI.Core.Tools;
 using UniGetUI.PackageEngine.PackageLoader;
 
@@ -8,9 +12,12 @@ namespace UniGetUI.Avalonia.Views.Pages;
 
 public partial class SoftwareCatalogPage : UserControl, IEnterLeaveListener, ISearchBoxPage
 {
+    private const string FilterPaneWidthKey = "SoftwareCatalog";
+    private const double DefaultFilterPaneWidth = 220;
     private readonly SoftwareCatalogViewModel _viewModel = new();
     private readonly DispatcherTimer _stateTimer = new() { Interval = TimeSpan.FromSeconds(2) };
     private InstalledPackagesLoader? _loader;
+    private double _savedFilterPaneWidth = DefaultFilterPaneWidth;
 
     public string QueryBackup
     {
@@ -27,6 +34,47 @@ public SoftwareCatalogPage()
         InitializeComponent();
         DataContext = _viewModel;
         _stateTimer.Tick += (_, _) => _viewModel.UpdateStates();
+
+        // Restore the per-page filter pane width from settings.
+        var savedWidth = Settings.GetDictionaryItem<string, int>(Settings.K.SidepanelWidths, FilterPaneWidthKey);
+        if (savedWidth >= 100) _savedFilterPaneWidth = savedWidth;
+        _viewModel.TrackedFilterPaneWidth = _savedFilterPaneWidth;
+
+        // Persist the dragged width and snap the pane closed when it is dragged below the minimum.
+        FilteringPanel.ColumnDefinitions[0]
+            .GetObservable(ColumnDefinition.WidthProperty)
+            .SubscribeValue(width =>
+            {
+                if (!_viewModel.IsFilterPaneOpen) return;
+                if (width.IsAbsolute && width.Value >= 100)
+                {
+                    _savedFilterPaneWidth = width.Value;
+                    _viewModel.TrackedFilterPaneWidth = width.Value;
+                    Settings.SetDictionaryItem(Settings.K.SidepanelWidths, FilterPaneWidthKey, (int)width.Value);
+                }
+                else if (width.IsAbsolute && width.Value < 100)
+                {
+                    _savedFilterPaneWidth = DefaultFilterPaneWidth;
+                    _viewModel.TrackedFilterPaneWidth = DefaultFilterPaneWidth;
+                    _viewModel.IsFilterPaneOpen = false;
+                }
+            });
+
+        _viewModel.PropertyChanged += OnViewModelPropertyChanged;
+        UpdateFilterPaneColumn(_viewModel.IsFilterPaneOpen);
+    }
+
+    private void OnViewModelPropertyChanged(object? sender, PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName == nameof(SoftwareCatalogViewModel.IsFilterPaneOpen))
+            UpdateFilterPaneColumn(_viewModel.IsFilterPaneOpen);
+    }
+
+    private void UpdateFilterPaneColumn(bool open)
+    {
+        if (FilteringPanel.ColumnDefinitions.Count < 2) return;
+        FilteringPanel.ColumnDefinitions[0].Width = open ? new GridLength(_savedFilterPaneWidth) : new GridLength(0);
+        FilteringPanel.ColumnDefinitions[1].Width = open ? new GridLength(12) : new GridLength(0);
     }
 
     public void OnEnter()

From 5909d3c1b7016d5f6ebf1dba1d2c4463361424db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Duquette?= <sduquette@devolutions.net>
Date: Fri, 9 Oct 2026 17:42:06 -0400
Subject: [PATCH 2/2] Display messages in the content pane.

---
 .../SoftwarePages/SoftwareCatalogViewModel.cs | 23 +++++++++++++++----
 .../SoftwarePages/SoftwareCatalogPage.axaml   | 15 ++++++------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
index 961bcd9693..0bb4ca8bad 100644
--- a/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
+++ b/src/UniGetUI.Avalonia/ViewModels/SoftwarePages/SoftwareCatalogViewModel.cs
@@ -109,12 +109,25 @@ public bool HasHiddenPackages
 
     public bool IsEmpty => !IsLoading && !HasError && Packages.Count == 0;
 
-    public bool HasStatusMessage => IsLoading || HasError || IsEmpty || HasHiddenPackages;
+    public string BackgroundText => HasError
+        ? ErrorMessage
+        : !IsEmpty ? ""
+        : HasHiddenPackages
+            ? CoreTools.Translate("Packages with unavailable sources are hidden. Change Filters to show them.")
+            : EmptyMessage;
+
+    public bool HasBackgroundText => BackgroundText.Length > 0;
 
     partial void OnIsLoadingChanged(bool value)
     {
         OnPropertyChanged(nameof(IsEmpty));
-        OnPropertyChanged(nameof(HasStatusMessage));
+        NotifyBackgroundTextChanged();
+    }
+
+    private void NotifyBackgroundTextChanged()
+    {
+        OnPropertyChanged(nameof(BackgroundText));
+        OnPropertyChanged(nameof(HasBackgroundText));
     }
 
     partial void OnSelectedCatalogChanged(CatalogDefinition? value)
@@ -134,7 +147,7 @@ partial void OnSelectedCatalogChanged(CatalogDefinition? value)
         }
         UpdateStates();
         OnPropertyChanged(nameof(IsEmpty));
-        OnPropertyChanged(nameof(HasStatusMessage));
+        NotifyBackgroundTextChanged();
     }
 
     [ObservableProperty]
@@ -149,7 +162,7 @@ partial void OnErrorMessageChanged(string value)
     {
         OnPropertyChanged(nameof(HasError));
         OnPropertyChanged(nameof(IsEmpty));
-        OnPropertyChanged(nameof(HasStatusMessage));
+        NotifyBackgroundTextChanged();
         if (value.Length > 0)
             Avalonia.Infrastructure.AccessibilityAnnouncementService.Announce(
                 value, global::Avalonia.Automation.AutomationLiveSetting.Assertive);
@@ -359,7 +372,7 @@ internal void ApplyAvailabilityFilter()
         OnPropertyChanged(nameof(HasHiddenPackages));
         OnPropertyChanged(nameof(EmptyMessage));
         OnPropertyChanged(nameof(IsEmpty));
-        OnPropertyChanged(nameof(HasStatusMessage));
+        NotifyBackgroundTextChanged();
     }
 
     private bool MatchesQuery(CatalogEntry entry, string query) => query.Length == 0 || SearchMode switch
diff --git a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
index 63dc60051b..4187f29c79 100644
--- a/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
+++ b/src/UniGetUI.Avalonia/Views/SoftwarePages/SoftwareCatalogPage.axaml
@@ -162,14 +162,7 @@
                 </ComboBox>
             </StackPanel>
         </Grid>
-        <StackPanel Grid.Row="2" Spacing="8" Margin="0,4,0,8" IsVisible="{Binding HasStatusMessage}">
-            <ProgressBar IsIndeterminate="True" IsVisible="{Binding IsLoading}" Height="3"/>
-            <TextBlock Text="{Binding ErrorMessage}" IsVisible="{Binding HasError}" TextWrapping="Wrap"
-                       Foreground="{DynamicResource SystemFillColorCriticalBrush}"/>
-            <TextBlock Text="{Binding EmptyMessage}" IsVisible="{Binding IsEmpty}"/>
-            <TextBlock Text="{t:Translate Packages with unavailable sources are hidden. Change Filters to show them.}"
-                       IsVisible="{Binding HasHiddenPackages}" TextWrapping="Wrap"/>
-        </StackPanel>
+        <ProgressBar Grid.Row="2" Margin="0,4,0,8" IsIndeterminate="True" IsVisible="{Binding IsLoading}" Height="3"/>
         <Grid Grid.Row="3" Name="FilteringPanel" ColumnDefinitions="220,12,*">
             <Border x:Name="InlineSidePanel"
                     Grid.Column="0"
@@ -430,6 +423,12 @@
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>
                 </ScrollViewer>
+                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center"
+                           FontSize="30" FontWeight="Bold" Opacity="0.5"
+                           TextAlignment="Center" TextWrapping="Wrap"
+                           Text="{Binding BackgroundText}"
+                           IsVisible="{Binding HasBackgroundText}"
+                           IsHitTestVisible="False"/>
             </Panel>
         </Grid>
         <Grid Grid.Row="4" Margin="0,4" HorizontalAlignment="Right">