From 0388511603b2ab5d4a25dec1fbc8ed9f4185f065 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Thu, 11 Jul 2024 18:58:59 +0100
Subject: [PATCH] Overflow styling works

---
 Wallet.Avalonia/App.axaml.cs                  |   4 +-
 Wallet.Avalonia/ItemEntryActionView.axaml     |   2 +
 .../WalletNavigationCollectionView.axaml      | 109 ------------------
 3 files changed, 4 insertions(+), 111 deletions(-)

diff --git a/Wallet.Avalonia/App.axaml.cs b/Wallet.Avalonia/App.axaml.cs
index f36058c..52cbafe 100644
--- a/Wallet.Avalonia/App.axaml.cs
+++ b/Wallet.Avalonia/App.axaml.cs
@@ -3,7 +3,6 @@ using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Markup.Xaml;
 using Wallet.Data;
 using HotAvalonia;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
@@ -13,6 +12,7 @@ using System.Linq;
 using Toolkit.Avalonia;
 using Toolkit.Foundation;
 using FluentAvalonia.Core;
+using Avalonia.Controls;
 
 namespace Wallet.Avalonia;
 
@@ -231,9 +231,9 @@ public partial class App : Application
                 services.AddHandler<CreateProfileImageHandler>();
 
                 services.AddTemplate<MainViewModel, MainView>("Main");
-                services.AddHandler<WalletNavigationCollectionViewModelActivationHandler>();
 
                 services.AddTemplate<WalletNavigationCollectionViewModel, WalletNavigationCollectionView>("Wallets");
+                services.AddHandler<WalletNavigationCollectionViewModelActivationHandler>();
 
                 services.AddTransient<FooterViewModel>();
 
diff --git a/Wallet.Avalonia/ItemEntryActionView.axaml b/Wallet.Avalonia/ItemEntryActionView.axaml
index 23bace7..ff73cb1 100644
--- a/Wallet.Avalonia/ItemEntryActionView.axaml
+++ b/Wallet.Avalonia/ItemEntryActionView.axaml
@@ -17,6 +17,8 @@
         MinHeight="{StaticResource MoreButtonMinHeight}"
         Margin="{StaticResource MoreButtonMargin}"
         Padding="{StaticResource MoreButtonPadding}"
+        HorizontalContentAlignment="Center"
+        VerticalContentAlignment="Center"
         Theme="{StaticResource TransparentButton}">
         <Viewbox Width="14" Height="14">
             <PathIcon
diff --git a/Wallet.Avalonia/WalletNavigationCollectionView.axaml b/Wallet.Avalonia/WalletNavigationCollectionView.axaml
index 5be263e..058ec8b 100644
--- a/Wallet.Avalonia/WalletNavigationCollectionView.axaml
+++ b/Wallet.Avalonia/WalletNavigationCollectionView.axaml
@@ -9,110 +9,6 @@
         ItemTemplate="{ReflectionBinding Template}"
         ItemsSource="{Binding}"
         SelectedItem="{Binding SelectedItem, Mode=TwoWay}">
-        <Overflow.Resources>
-            <StaticResource x:Key="ListViewItemBackgroundSelected" ResourceKey="SubtleFillColorTransparentBrush" />
-            <x:Double x:Key="WalletItemSize">40</x:Double>
-            <CornerRadius x:Key="WalletItemCornerRadius">40</CornerRadius>
-            <ControlTheme x:Key="{x:Type ListBoxItem}" TargetType="ListBoxItem">
-                <Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
-                <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
-                <Setter Property="Background" Value="{DynamicResource ListViewItemBackground}" />
-                <Setter Property="Foreground" Value="{DynamicResource ListViewItemForeground}" />
-                <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-                <Setter Property="VerticalContentAlignment" Value="Center" />
-                <Setter Property="Width" Value="{StaticResource WalletItemSize}" />
-                <Setter Property="Height" Value="{StaticResource WalletItemSize}" />
-                <Setter Property="MinHeight" Value="{StaticResource WalletItemSize}" />
-                <Setter Property="MinWidth" Value="{StaticResource WalletItemSize}" />
-                <Setter Property="CornerRadius" Value="{StaticResource WalletItemCornerRadius}" />
-                <Setter Property="Template">
-                    <ControlTemplate>
-                        <Panel>
-                            <Border
-                                x:Name="PART_ContentBorder"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{TemplateBinding CornerRadius}">
-                                <Grid>
-                                    <ContentPresenter
-                                        Name="PART_ContentPresenter"
-                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                        Content="{TemplateBinding Content}"
-                                        ContentTemplate="{TemplateBinding ContentTemplate}" />
-                                    <Border
-                                        Name="SelectionIndicator"
-                                        BorderBrush="{DynamicResource AccentFillColorDefaultBrush}"
-                                        BorderThickness="3"
-                                        CornerRadius="{TemplateBinding CornerRadius}"
-                                        IsVisible="False"
-                                        UseLayoutRounding="False" />
-                                </Grid>
-                            </Border>
-                        </Panel>
-                    </ControlTemplate>
-                </Setter>
-                <Style Selector="^:disabled">
-                    <Setter Property="Opacity" Value="0.5" />
-                </Style>
-                <Style Selector="^:pointerover">
-                    <Style Selector="^ /template/ Border#PART_ContentBorder">
-                        <Setter Property="Background" Value="{DynamicResource ListViewItemBackgroundPointerOver}" />
-                    </Style>
-                    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                        <Setter Property="Foreground" Value="{DynamicResource ListViewItemForegroundPointerOver}" />
-                    </Style>
-                </Style>
-                <Style Selector="^:pressed">
-                    <Style Selector="^ /template/ Border#PART_ContentBorder">
-                        <Setter Property="Background" Value="{DynamicResource ListViewItemBackgroundPressed}" />
-                    </Style>
-                    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                        <Setter Property="Foreground" Value="{DynamicResource ListViewItemForegroundPressed}" />
-                    </Style>
-                </Style>
-                <Style Selector="^:selected">
-                    <Style Selector="^ /template/ Border#PART_ContentBorder">
-                        <Setter Property="Background" Value="{DynamicResource ListViewItemBackgroundSelected}" />
-                    </Style>
-                    <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                        <Setter Property="Foreground" Value="{DynamicResource ListViewItemForegroundSelected}" />
-                    </Style>
-                    <Style Selector="^ /template/ Border#SelectionIndicator">
-                        <Setter Property="IsVisible" Value="True" />
-                    </Style>
-                    <Style Selector="^:not(:focus) /template/ Border#PART_ContentBorder">
-                        <Setter Property="Background" Value="{DynamicResource ListViewItemBackgroundSelected}" />
-                    </Style>
-                    <Style Selector="^:not(:focus) /template/ ContentPresenter#PART_ContentPresenter">
-                        <Setter Property="Foreground" Value="{DynamicResource ListViewItemForegroundSelected}" />
-                    </Style>
-                    <Style Selector="^:pointerover">
-                        <Style Selector="^ /template/ Border#PART_ContentBorder">
-                            <Setter Property="Background" Value="{DynamicResource ListViewItemBackgroundSelectedPointerOver}" />
-                        </Style>
-                        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                            <Setter Property="Foreground" Value="{DynamicResource ListViewItemForegroundSelectedPointerOver}" />
-                        </Style>
-                        <Style Selector="^ /template/ Border#SelectionIndicator">
-                            <Setter Property="BorderBrush" Value="{DynamicResource ListViewItemSelectionIndicatorPointerOverBrush}" />
-                        </Style>
-                    </Style>
-                    <Style Selector="^:pressed">
-                        <Style Selector="^ /template/ Border#PART_ContentBorder">
-                            <Setter Property="Background" Value="{DynamicResource ListViewItemBackgroundSelectedPressed}" />
-                        </Style>
-                        <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
-                            <Setter Property="Foreground" Value="{DynamicResource ListViewItemForegroundSelectedPressed}" />
-                        </Style>
-                    </Style>
-                    <Style Selector="^:disabled /template/ Border#SelectionIndicator">
-                        <Setter Property="BorderBrush" Value="{DynamicResource ListViewItemSelectionIndicatorDisabledBrush}" />
-                    </Style>
-                </Style>
-            </ControlTheme>
-        </Overflow.Resources>
         <Overflow.Styles>
             <Style Selector="Overflow.Closed">
                 <Setter Property="Margin" Value="1,2,1,0" />
@@ -127,11 +23,6 @@
                 </Style>
             </Style>
         </Overflow.Styles>
-        <Overflow.ItemsPanel>
-            <ItemsPanelTemplate>
-                <StackPanel Spacing="6" />
-            </ItemsPanelTemplate>
-        </Overflow.ItemsPanel>
         <Interaction.Behaviors>
             <DataTriggerBehavior Binding="{Binding $parent[NavigationView].IsPaneOpen}" Value="True">
                 <AddClassAction ClassName="Opened" RemoveIfExists="True" />