Multiple options allowed to be active at the same time.

WIP: Issue: Focus mode do duplicate insertions when the element has not been expanded yet (only cosmetic, but annoying)

Author: EXT-Gweltaz

src/FlaUInspect/Core/FocusTrackingMode.cs

@@ -5,25 +5,26 @@
 
 namespace FlaUInspect.Core;
 
-public class FocusTrackingMode(AutomationBase? automation, Action<AutomationElement> onFocusChangedAction) {
+public class FocusTrackingMode(AutomationBase? automation, Func<AutomationElement, AutomationElement?> onFocusChangedAction) {
 	private AutomationElement? _currentFocusedElement;
 	private FocusChangedEventHandlerBase? _eventHandler;
 
 	public void Start()
 		// Might give problems because inspect is registered as well.
 		// MS recommends to call UIA commands on a thread outside a UI thread.
-		=> Task.Factory.StartNew(() => _eventHandler = automation?.RegisterFocusChangedEvent(OnFocusChanged));
+		=> _eventHandler = automation?.RegisterFocusChangedEvent(OnFocusChanged);
 
 	public void Stop() {
 		if (_eventHandler != null)
 			automation?.UnregisterFocusChangedEvent(_eventHandler);
+		automation?.UnregisterAllEvents();
 	}
 
 	private void OnFocusChanged(AutomationElement? automationElement) {
 		// Skip items in the current process
 		// Like Inspect itself or the overlay window
 		try {
-			if (automationElement?.Properties.ProcessId.IsSupported == true && automationElement.Properties.ProcessId == Environment.ProcessId)
+			if (automationElement?.Properties.ProcessId.IsSupported != true || automationElement.Properties.ProcessId == Environment.ProcessId)
 				return;
 		}
 		catch (Exception) {
@@ -32,10 +33,7 @@ private void OnFocusChanged(AutomationElement? automationElement) {
 		}
 
 		if (!Equals(_currentFocusedElement, automationElement)) {
-			_currentFocusedElement = automationElement;
-
-			if (automationElement != null)
-				Application.Current.Dispatcher.Invoke(() => onFocusChangedAction(automationElement));
+			_currentFocusedElement = Application.Current.Dispatcher.Invoke(() => onFocusChangedAction(automationElement));
 		}
 	}
 }

src/FlaUInspect/ViewModels/ElementViewModel.cs

@@ -62,19 +62,17 @@ public List<ElementViewModel> LoadChildren(int loadSubChildren = 0) {
 			return [];
 		}
 	}
+
 	public override bool Equals(object? obj) => Equals(obj as ElementViewModel);
 
 	public bool Equals(ElementViewModel? y) => y is not null
 		&& (ReferenceEquals(this, y)
 			|| (GetType() == y.GetType()
 				&& Level == y.Level
-				&& IsSelected == y.IsSelected
-				&& IsExpanded == y.IsExpanded
-				&& AutomationId == y.AutomationId
-				&& ControlType == y.ControlType
-				&& Name == y.Name));
+				&& AutomationElement == y.AutomationElement
+				&& Parent! == y.Parent!));
 
-	public override int GetHashCode() => (Level, IsSelected, IsExpanded, AutomationId, ControlType, Name).GetHashCode();
+	public override int GetHashCode() => (Level, AutomationId, ControlType, Name).GetHashCode();
 
 	public static bool operator ==(ElementViewModel lhs, ElementViewModel rhs) => lhs is null
 			? rhs is null

src/FlaUInspect/ViewModels/ProcessViewModel.cs

@@ -1,5 +1,6 @@
 using System.Collections.ObjectModel;
 using System.Drawing.Imaging;
+using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Input;
 using FlaUI.Core;
@@ -53,7 +54,7 @@ public ProcessViewModel(AutomationBase automation, int processId, IntPtr mainWin
 		HoverManager.AddListener(_windowHandle,
 								 x => {
 									 if (EnableHoverMode)
-										 ElementToSelectChanged(x);
+										 _ = ElementToSelectChanged(x);
 								 });
 		HoverManager.Disable(_windowHandle);
 
@@ -180,7 +181,7 @@ public bool EnableFocusTrackingMode {
 	private static ElementOverlay CreateTrackHighlighterOverlay() => App.FlaUiAppOptions.SelectionOverlay() ?? App.FlaUiAppOptions.DefaultOverlay();
 
 	private void TrackSelectedItem(ElementViewModel? item) {
-		if (item is null) {
+		if (item is null || item.Level <= 0) {
 			_trackHighlighterOverlay?.Dispose();
 			return;
 		}
@@ -204,9 +205,6 @@ private void SetMode() {
 		_trackHighlighterOverlay?.Dispose();
 		_focusTrackingMode?.Stop();
 
-		//if (new[] { EnableHoverMode, EnableHighLightSelectionMode, EnableFocusTrackingMode }.Count(x => x) != 1)
-		//	return;
-
 		if (EnableFocusTrackingMode)
 			_focusTrackingMode?.Start();
 		else if (EnableHighLightSelectionMode)
@@ -223,22 +221,16 @@ public void Initialize() {
 
 		Elements = new ObservableCollection<ElementViewModel>(desktopViewModel.Children);
 
-		// Initialize hover
-		EnableHoverMode = false;
-
 		// Initialize focus tracking
-		_focusTrackingMode = new FocusTrackingMode(_automation,
-												   x => {
-													   if (EnableFocusTrackingMode)
-														   ElementToSelectChanged(x);
-												   });
+		_focusTrackingMode ??= new FocusTrackingMode(_automation,
+													   x => EnableFocusTrackingMode ? ElementToSelectChanged(x)?.AutomationElement : null);
 		SelectedItem = desktopViewModel;
 
 		OnPropertyChanged(nameof(Elements));
 		OnPropertyChanged(nameof(ElementPatterns));
 	}
 
-	public void ElementToSelectChanged(AutomationElement? obj, bool forceExpand = false) => SelectedItem = GetNextElementVm(forceExpand, GetPathToRoot(obj, forceExpand), Elements);
+	public ElementViewModel? ElementToSelectChanged(AutomationElement? obj, bool forceExpand = false) => SelectedItem = GetNextElementVm(forceExpand, GetPathToRoot(obj, forceExpand), Elements);
 
 	private Stack<AutomationElement> GetPathToRoot(AutomationElement? obj, bool forceExpand) {
 		Stack<AutomationElement> pathToRoot = new();
@@ -351,11 +343,12 @@ private static void ExpandElement(ElementViewModel sender, ObservableCollection<
 		var children = sender.LoadChildren(1);
 
 		foreach (var child in children)
-			// Check if not in tree before insert
-			// Note: .Contains does not check for .Equals
-			//if (!elements.Any(child.Equals))
 			if (!elements.Contains(child))
-				elements.Insert(senderIndex + 1, child);
+				try {
+					elements.Insert(++senderIndex, child);
+				}
+				catch (NotSupportedException) { }
+				catch (InvalidOperationException) { }
 	}
 
 	public void CollapseElement(ElementViewModel sender) => CollapseElement(sender, Elements);