Some moves towards UI isolation

Razor/Client/ClassicUO.cs

@@ -158,7 +158,7 @@ public class ClassicUOClient : Client
         private static OnFocusLost _onFocusLost;
         private IntPtr m_ClientWindow;
 
-        public override void SetMapWndHandle(Form mapWnd)
+        public override void SetMapWndHandle(IntPtr mapWndHandle)
         {
         }
 

Razor/Client/Client.cs

@@ -23,7 +23,6 @@
 using System.Diagnostics;
 using System.Net;
 using System.Text;
-using System.Windows.Forms;
 
 namespace Assistant
 {
@@ -98,7 +97,7 @@ public void SetFeatures(ulong features)
 
         public abstract bool ClientRunning { get; }
 
-        public abstract void SetMapWndHandle(Form mapWnd);
+        public abstract void SetMapWndHandle(IntPtr mapWndHandle);
 
         public abstract void RequestStatbarPatch(bool preAOS);
 

Razor/Client/OSI.cs

@@ -177,9 +177,9 @@ public override bool ClientRunning
             }
         }
 
-        public override void SetMapWndHandle(Form mapWnd)
+        public override void SetMapWndHandle(IntPtr mapWndHandle)
         {
-            Platform.PostMessage(FindUOWindow(), WM_UONETEVENT, (IntPtr) UONetMessage.SetMapHWnd, mapWnd.Handle);
+            Platform.PostMessage(FindUOWindow(), WM_UONETEVENT, (IntPtr) UONetMessage.SetMapHWnd, mapWndHandle);
         }
 
         public override void RequestStatbarPatch(bool preAOS)

Razor/Core/OverheadManager.cs

@@ -20,11 +20,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
 using System.Xml;
-using Assistant.UI;
-using Ultima;
 
 namespace Assistant.Core
 {
@@ -37,13 +33,10 @@ public class OverheadMessage
 
     public static class OverheadManager
     {
-        private static ListView _listView;
-
-        public static List<OverheadMessage> OverheadMessages = new List<OverheadMessage>();
-
-        public static void SetControls(ListView listView)
-        {
-            _listView = listView;
+        private static readonly List<OverheadMessage> _overheadMessages = new List<OverheadMessage>();
+        public static IReadOnlyList<OverheadMessage> OverheadMessages
+        {
+            get { return _overheadMessages; }
         }
 
         public static void Save(XmlTextWriter xml)
@@ -75,7 +68,7 @@ public static void Load(XmlElement node)
                             : Convert.ToInt32(el.GetAttribute("hue"))
                     };
 
-                    OverheadMessages.Add(overheadMessage);
+                    _overheadMessages.Add(overheadMessage);
                 }
             }
             catch
@@ -86,7 +79,7 @@ public static void Load(XmlElement node)
 
         public static void ClearAll()
         {
-            OverheadMessages.Clear();
+            _overheadMessages.Clear();
         }
 
         public static void Remove(string text)
@@ -95,37 +88,12 @@ public static void Remove(string text)
             {
                 if (message.SearchMessage.Equals(text))
                 {
-                    OverheadMessages.Remove(message);
+                    _overheadMessages.Remove(message);
                     break;
                 }
             }
         }
 
-        public static void RedrawList()
-        {
-            _listView.SafeAction(s => s.Items.Clear());
-
-            foreach (OverheadMessage message in OverheadMessages)
-            {
-                ListViewItem item = new ListViewItem($"{message.SearchMessage}");
-                item.SubItems.Add(new ListViewItem.ListViewSubItem(item, message.MessageOverhead));
-
-                int hueIdx = message.Hue;
-
-                if (hueIdx > 0 && hueIdx < 3000)
-                    item.SubItems[1].BackColor = Hues.GetHue(hueIdx - 1).GetColor(HueEntry.TextHueIDX);
-                else
-                    item.SubItems[1].BackColor = SystemColors.Control;
-
-                item.SubItems[1].ForeColor =
-                    (item.SubItems[1].BackColor.GetBrightness() < 0.35 ? Color.White : Color.Black);
-
-                item.UseItemStyleForSubItems = false;
-
-                _listView.SafeAction(s => s.Items.Add(item));
-            }
-        }
-
         public static void DisplayOverheadMessage(string text)
         {
             if (Config.GetBool("ShowOverheadMessages") && OverheadMessages.Count > 0)
@@ -154,34 +122,33 @@ public static void DisplayOverheadMessage(string text)
             }
         }
 
-        public static void SetOverheadHue()
-        {
-            ListViewItem selectedItem = _listView.Items[_listView.SelectedIndices[0]];
-
-            HueEntry h = new HueEntry(GetHue(selectedItem.SubItems[1].Text));
-
-            if (h.ShowDialog(Engine.MainWindow) == DialogResult.OK)
-            {
-                int hueIdx = h.Hue;
-
-                if (hueIdx > 0 && hueIdx < 3000)
-                    selectedItem.SubItems[1].BackColor = Hues.GetHue(hueIdx - 1).GetColor(HueEntry.TextHueIDX);
-                else
-                    selectedItem.SubItems[1].BackColor = Color.White;
+        public static void SetMessageHue(string text, int hue)
+        {
+            foreach (var message in OverheadMessages)
+            {
+                if (message.SearchMessage.Equals(text))
+                {
+                    message.Hue = hue;
+                    break;
+                }
+            }
+        }
 
-                selectedItem.SubItems[1].ForeColor = (selectedItem.SubItems[1].BackColor.GetBrightness() < 0.35
-                    ? Color.White
-                    : Color.Black);
+        public static void AddOverheadMessage(OverheadMessage message)
+        {
+            _overheadMessages.Add(message);
+        }
 
-                foreach (OverheadMessage list in OverheadManager.OverheadMessages)
-                {
-                    if (list.SearchMessage.Equals(selectedItem.Text))
-                    {
-                        list.Hue = hueIdx;
-                        break;
-                    }
-                }
-            }
+        public static void ReplaceOverheadMessage(string oldMessage, string newMessage)
+        {
+            foreach (var message in OverheadMessages)
+            {
+                if (message.MessageOverhead.Equals(oldMessage))
+                {
+                    message.MessageOverhead = newMessage;
+                    break;
+                }
+            }
         }
 
         public static int GetHue(string id)

Razor/Core/TextFilterManager.cs

@@ -21,35 +21,28 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Windows.Forms;
 using System.Xml;
-using Assistant.UI;
 
 namespace Assistant.Core
 {
     public static class TextFilterManager
     {
-        private static ListBox _filterTextList;
-
         public static List<string> FilteredText = new List<string>();
 
-        public static void SetControls(ListBox filterTextList)
-        {
-            _filterTextList = filterTextList;
-        }
+        public delegate void ItemsChangedCallback();
+
+        public static ItemsChangedCallback OnItemsChanged { get; set; }
 
         public static void AddFilter(string filter)
         {
             FilteredText.Add(filter);
-
-            RedrawList();
+            OnItemsChanged?.Invoke();
         }
 
         public static void RemoveFilter(string filter)
         {
             FilteredText.Remove(filter);
-
-            RedrawList();
+            OnItemsChanged?.Invoke();
         }
 
         public static void Save(XmlTextWriter xml)
@@ -89,7 +82,7 @@ public static void Load(XmlElement node)
                     FilteredText.Add(Convert.ToString(el.GetAttribute("text")));
                 }
 
-                RedrawList();
+                OnItemsChanged?.Invoke();
             }
             catch (Exception ex)
             {
@@ -101,21 +94,5 @@ public static void ClearAll()
         {
             FilteredText.Clear();
         }
-
-        public static void RedrawList()
-        {
-            _filterTextList?.SafeAction(s =>
-            {
-                s.BeginUpdate();
-                s.Items.Clear();
-
-                foreach (string text in FilteredText)
-                {
-                    s.Items.Add(text);
-                }
-
-                s.EndUpdate();
-            });
-        }
     }
 }

Razor/Core/WaypointManager.cs

@@ -21,36 +21,30 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Windows.Forms;
 using System.Xml;
-using Assistant.UI;
 
 namespace Assistant.Core
 {
     public static class WaypointManager
     {
-        private static ListBox _waypointList;
         private static WaypointDistanceTimer _waypointTimer;
 
         public static Waypoint CurrentWaypoint;
         private static int _curWaypointIndex;
 
         public static List<Waypoint> Waypoints = new List<Waypoint>();
 
+        public delegate void WaypointsChangedCallback();
+
+        public static WaypointsChangedCallback OnWaypointsChanged;
+
         public static void Initialize()
         {
             HotKey.Add(HKCategory.Misc, LocString.NextWaypoint, new HotKeyCallback(NextWaypoint));
             HotKey.Add(HKCategory.Misc, LocString.PrevWaypoint, new HotKeyCallback(PrevWaypoint));
             HotKey.Add(HKCategory.Misc, LocString.HideWaypoint, new HotKeyCallback(ClearWaypoint));
         }
 
-        public static void SetControls(ListBox waypointList)
-        {
-            _waypointList = waypointList;
-            _waypointTimer = new WaypointDistanceTimer();
-            _waypointTimer.Stop();
-        }
-
         public class Waypoint
         {
             public int X { get; set; }
@@ -86,17 +80,14 @@ public static void PrevWaypoint()
         public static void AddWaypoint(Waypoint waypoint)
         {
             Waypoints.Add(waypoint);
-
-            RedrawList();
+            OnWaypointsChanged?.Invoke();
         }
 
         public static void RemoveWaypoint(Waypoint waypoint)
         {
             ClearWaypoint();
-
-            Waypoints.Remove(waypoint);
-
-            RedrawList();
+            Waypoints.Remove(waypoint);
+            OnWaypointsChanged?.Invoke();
         }
 
         public static void ShowWaypoint(Waypoint waypoint)
@@ -124,7 +115,7 @@ public static void ClearWaypoint()
 
         public static void ResetTimer()
         {
-            if (_waypointTimer.Running)
+            if (_waypointTimer != null && _waypointTimer.Running)
             {
                 _waypointTimer.Stop();
                 _waypointTimer = new WaypointDistanceTimer();
@@ -221,7 +212,7 @@ public static void Load(XmlElement node)
                     Waypoints.Add(waypoint);
                 }
 
-                RedrawList();
+                OnWaypointsChanged?.Invoke();
             }
             catch (Exception ex)
             {
@@ -233,21 +224,5 @@ public static void ClearAll()
         {
             Waypoints.Clear();
         }
-
-        public static void RedrawList()
-        {
-            _waypointList?.SafeAction(s =>
-            {
-                s.BeginUpdate();
-                s.Items.Clear();
-
-                foreach (Waypoint waypoint in Waypoints)
-                {
-                    s.Items.Add(waypoint);
-                }
-
-                s.EndUpdate();
-            });
-        }
     }
 }