Finalized grouping implementation, code cleanup

Author: TanukiSharp

MHArmory.Core.WPF/Behaviors/DebugLayoutBehavior.cs

@@ -47,17 +47,17 @@ private static void ItemLoaded(object sender, RoutedEventArgs e)
         private static void OnAttachedElementLoaded(FrameworkElement item)
         {
             item.Name = "ROOT";
-            Go(item);
+            ListenLayoutChanges(item);
         }
 
-        private static void Go(DependencyObject item)
+        private static void ListenLayoutChanges(DependencyObject item)
         {
             if (item is UIElement element)
                 element.LayoutUpdated += (s, e) => OnLayoutUpdated(element, s, e);
 
             int childCount = VisualTreeHelper.GetChildrenCount(item);
             for (int i = 0; i < childCount; i++)
-                Go(VisualTreeHelper.GetChild(item, i));
+                ListenLayoutChanges(VisualTreeHelper.GetChild(item, i));
         }
 
         private static void OnLayoutUpdated(UIElement element, object sender, EventArgs e)

MHArmory.Core.WPF/Behaviors/SelectionChangedViewNotifierBehavior.cs

@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace MHArmory.Core.WPF.Behaviors
+{
+    public interface ISelectionChangedViewNotifier
+    {
+        Action<object> SelectionChangedHandler { get; set; }
+    }
+
+    public static class SelectionChangedViewNotifierBehavior
+    {
+        public static bool GetIsAttached(ItemsControl target)
+        {
+            return (bool)target.GetValue(IsAttachedProperty);
+        }
+
+        public static void SetIsAttached(ItemsControl target, bool value)
+        {
+            target.SetValue(IsAttachedProperty, value);
+        }
+
+        public static readonly DependencyProperty IsAttachedProperty = DependencyProperty.RegisterAttached(
+            "IsAttached",
+            typeof(bool),
+            typeof(SelectionChangedViewNotifierBehavior),
+            new PropertyMetadata(OnIsAttachedChanged)
+        );
+
+        private static void OnIsAttachedChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            var itemsControl = (ItemsControl)sender;
+
+            if ((bool)e.NewValue)
+                itemsControl.DataContextChanged += ItemsControl_DataContextChanged;
+            else
+                itemsControl.DataContextChanged -= ItemsControl_DataContextChanged;
+        }
+
+        private static void ItemsControl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            var itemsControl = (ItemsControl)sender;
+            var scrollViewer = VisualTreeHelper.GetChild(itemsControl, 0) as ScrollViewer;
+
+            if (e.NewValue is ISelectionChangedViewNotifier notifier)
+            {
+                notifier.SelectionChangedHandler = (obj) =>
+                {
+                    if (obj == null)
+                    {
+                        scrollViewer.ScrollToHome();
+                        return;
+                    }
+
+                    DependencyObject container = itemsControl.ItemContainerGenerator.ContainerFromItem(obj);
+
+                    if (container == null)
+                    {
+                        scrollViewer.ScrollToHome();
+                        return;
+                    }
+
+                    if (container is FrameworkElement element)
+                        element.BringIntoView();
+                };
+            }
+        }
+    }
+}

MHArmory.Core.WPF/Controls/CustomListBox.cs

@@ -35,40 +35,12 @@ public static void SetIsScrollEnabled(DependencyObject target, bool value)
             new PropertyMetadata(true)
         );
 
-        //private ScrollBar verticalScrollBar = null;
-
-        protected override void OnTemplateChanged(ControlTemplate oldTemplate, ControlTemplate newTemplate)
-        {
-            base.OnTemplateChanged(oldTemplate, newTemplate);
-
-            //if (newTemplate != null)
-            //{
-            //    ApplyTemplate();
-            //    object lol = newTemplate.FindName("PART_VerticalScrollBar", this);
-            //    verticalScrollBar = (ScrollBar)lol;
-            //    Console.WriteLine(lol);
-            //}
-        }
-
         protected override void OnMouseWheel(MouseWheelEventArgs e)
         {
             if (GetIsScrollEnabled(TemplatedParent) == false)
                 e.Handled = true;
             else
                 base.OnMouseWheel(e);
         }
-
-        protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-
-
-            //if (e.Property.Name.Contains("ScrollBar"))
-            //{
-            //    Console.WriteLine($"{e.Property.Name}: {e.OldValue} -> {e.NewValue}");
-            //    if (verticalScrollBar != null)
-            //        verticalScrollBar.Visibility = Visibility.Visible;
-            //}
-        }
     }
 }

MHArmory.Core.WPF/Controls/CustomScrollViewer.cs

@@ -107,8 +107,6 @@ public RootViewModel()
             SetupLocalization();
 
             Extensions = new ExtensionSelectorViewModel(this);
-
-            SearchResultsViewModel.Initialize();
         }
 
         private void SetupLocalization()