hover/selection color

punker76 · Nov 13, 2024 · 0f452d9 · 0f452d9
1 parent bb221b6
commit 0f452d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/...s.IconPacksBrowser.Avalonia/MahApps.IconPacksBrowser.Avalonia/ViewModels/MainViewModel.cs b/...s.IconPacksBrowser.Avalonia/MahApps.IconPacksBrowser.Avalonia/ViewModels/MainViewModel.cs
@@ -73,7 +73,7 @@ public MainViewModel()
 
         _iconsCache.Connect()
             .Filter(filterByText)
-            .Sort(SortExpressionComparer<IIconViewModel>.Ascending(e => e.Identifier))
+            .Sort(SortExpressionComparer<IIconViewModel>.Ascending(e => e.IconPackName).ThenByAscending(e => e.Name))
             .Page(_pager)
             .Do(change => PagingUpdate(change.Response))
             .ObserveOn(RxApp.MainThreadScheduler)

diff --git a/src/MahApps.IconPacksBrowser.Avalonia/MahApps.IconPacksBrowser.Avalonia/Views/MainView.axaml b/src/MahApps.IconPacksBrowser.Avalonia/MahApps.IconPacksBrowser.Avalonia/Views/MainView.axaml
@@ -5,6 +5,7 @@
              xmlns:vm="clr-namespace:MahApps.IconPacksBrowser.Avalonia.ViewModels"
              xmlns:controls="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
              xmlns:helper="clr-namespace:MahApps.IconPacksBrowser.Avalonia.Helper"
+             xmlns:iconPacks="https://github.com/MahApps/IconPacks.Avalonia"
              mc:Ignorable="d"
              d:DesignWidth="800"
              d:DesignHeight="450"
@@ -89,6 +90,16 @@
                          ItemTemplate="{StaticResource IconPacksBrowser.DataTemplates.ListBox.IconViewModel}"
                          ItemsSource="{Binding VisibleIcons}"
                          SelectedValue="{Binding SelectedIcon}">
+
+                    <ListBox.Styles>
+                        <Style Selector="ListBoxItem:selected iconPacks|PackIconControl#PackIcon">
+                            <Setter Property="Foreground" Value="{DynamicResource SystemAccentColor}" />
+                        </Style>
+                        <Style Selector="ListBoxItem:pointerover iconPacks|PackIconControl#PackIcon">
+                            <Setter Property="Foreground" Value="{DynamicResource ListBoxItemPointerOverForegroundThemeBrush}" />
+                        </Style>
+                    </ListBox.Styles>
+
                     <ListBox.ItemsPanel>
                         <ItemsPanelTemplate>
                             <!-- <VirtualizingStackPanel Orientation="Vertical" /> -->