Widow – Diff between revs 12 and 14

Subversion Repositories:

?pathlinks?

Rev 12 – Go to most recent revision – Details – Blame – Last modification – View Log

 namespace Widow
+{
     public class WindowManipulation : IDisposable
-    {
-        #region Public Events & Delegates
-        public event EventHandler<WindowManipulatedEventArgs> WindowManipulated;
-        #endregion
+    {
         #region Public Enums, Properties and Fields
         private CancellationTokenSource CancellationTokenSource { get; set; }
         private Task ApplyEveryTask { get; }
-        private BufferBlock<Window> WindowsBufferBlock { get; }
+        private BufferBlock<WindowModification> WindowsBufferBlock { get; }
-        private ActionBlock<Window> WindowsActionBlock { get; }
+        private ActionBlock<WindowModification> WindowsActionBlock { get; }
         private IDisposable WindowsLink { get; set; }
         #endregion
         #region Constructors, Destructors and Finalizers
             if (!OnWindowCreate)
+            {
                 return;
+            }
+            var @class = Helpers.GetWindowClass(e.Handle);
-            if (!WindowsToManipulate.TryGetWindow(e.Title, out _))
+            if (!WindowsToManipulate.TryGetWindow(new WindowHash(e.Title, @class), out _))
+            {
                 return;
+            }
         #region Public Methods
         public async Task Apply()
         {
-            var windows = new List<Window>();
+            var windows = new List<WindowModification>();
-            foreach (var hWnd in Helpers.EnumerateWindows())
+            foreach (var hWnd in Helpers.FindWindows((wnd, param) => true))
+            {
+                var windowTitle = Helpers.GetWindowTitle(hWnd);
+                if (string.IsNullOrEmpty(windowTitle))
+                {
+                    continue;
-            {
+                }
                 var title = Helpers.GetWindowTitle(hWnd);
                 var windowClass = Helpers.GetWindowClass(hWnd);
-                if (string.IsNullOrEmpty(title))
+                if (string.IsNullOrEmpty(windowClass))
+                {
-                {
+                    continue;
                     continue;
                 var windowHash = new WindowHash(windowTitle, windowClass);
-                if (!WindowsToManipulate.TryGetWindow(title, out var window))
+                if (!WindowsToManipulate.TryGetWindow(windowHash, out var window))
+                {
                     continue;
+                }
-                windows.Add(window);
+                windows.Add(new WindowModification(hWnd, window));
             }
-            await Task.WhenAll(windows.Select(window => WindowsBufferBlock.SendAsync(window)));
+            await Task.WhenAll(windows.Select(modification => WindowsBufferBlock.SendAsync(modification)));
+        }
-        #endregion
-        #region Private Methods
-        private void ManipulateWindows(Window window)
-        {
-            foreach (var hWnd in Helpers.FindWindowsWithText(window.Title))
-            {
-                if (hWnd == IntPtr.Zero)
-                {
-                    continue;
-                }
-                if (!Natives.GetWindowRect(hWnd, out var rect))
+        #endregion
-                {
-                    continue;
-                }
+        #region Private Methods
-                var left = window.Left;
+        private static void ManipulateWindows(WindowModification modification)
-                if (window.IgnoreLeft)
+        {
-                {
+            if (modification.Handle == IntPtr.Zero)
-                    left = rect.Left;
+            {
-                }
+                return;
+            }
-                var top = window.Top;
-                if (window.IgnoreTop)
+            if (!Natives.GetWindowRect(modification.Handle, out var rect))
-                {
+            {
-                    top = rect.Top;
+                return;
-                }
+            }
+            var left = modification.Window.Left;
+            if (modification.Window.IgnoreLeft)
+            {
+                left = rect.Left;
+            }
-                var width = window.Width;
+            var top = modification.Window.Top;
+            if (modification.Window.IgnoreTop)
                 if (window.IgnoreWidth)
+                top = rect.Top;
+            }
-                    width = rect.Left - rect.Right;
+            var width = modification.Window.Width;
             if (modification.Window.IgnoreWidth)
+            {