refactor: inherit from PathIcon and use own style again

punker76 · Oct 26, 2024 · 5d1edaa · 5d1edaa
1 parent 33d9a28
commit 5d1edaa
Show file tree

Hide file tree

Showing 6 changed files with 663 additions and 744 deletions.
diff --git a/src/AvaloniaApp/App.axaml b/src/AvaloniaApp/App.axaml
@@ -28,6 +28,6 @@
                                        ListLow="#ff134b82" ListMedium="#ff2f7bad" RegionColor="#ff0d2644" />
             </FluentTheme.Palettes>
         </FluentTheme>
-        <!-- <StyleInclude Source="avares://AvaloniaIconPacks/BoxIcons.xaml"/> -->
+         <StyleInclude Source="avares://AvaloniaIconPacks/BoxIcons.xaml"/> 
     </Application.Styles>
 </Application>
diff --git a/src/AvaloniaIconPacks/Core/PackIconBase.cs b/src/AvaloniaIconPacks/Core/PackIconBase.cs
@@ -1,20 +1,20 @@
-#if (NETFX_CORE || WINDOWS_UWP)
-using Windows.UI.Xaml.Controls;
-#elif AVALONIA
-using Avalonia.Controls.Primitives;
-#else
-using System.Windows.Controls;
-#endif
-
-namespace MahApps.Metro.IconPacks
-{
-#if AVALONIA
-    public abstract class PackIconBase : TemplatedControl
-#else
-    public abstract class PackIconBase : Control
-#endif
-    {
-        protected internal abstract void SetKind<TKind>(TKind iconKind);
-        protected abstract void UpdateData();
-    }
+#if (NETFX_CORE || WINDOWS_UWP)
+using Windows.UI.Xaml.Controls;
+#elif AVALONIA
+using Avalonia.Controls;
+#else
+using System.Windows.Controls;
+#endif
+
+namespace MahApps.Metro.IconPacks
+{
+#if AVALONIA
+    public abstract class PackIconBase : PathIcon
+#else
+    public abstract class PackIconBase : Control
+#endif
+    {
+        protected internal abstract void SetKind<TKind>(TKind iconKind);
+        protected abstract void UpdateData();
+    }
 }