Proposed Fix for Issue #69 - Better handling of Always-On-Top apps

Switcheroo/Extensions.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using ManagedWinapi.Windows;
+
+namespace Switcheroo
+{
+	public static class Extensions
+	{
+		public static bool IsPinnedToBottom(this AppWindowViewModel appWindow, IEnumerable<IntPtr> pinnedList)
+		{
+			return pinnedList.Any(ptr => (long)ptr == (long)appWindow.HWnd);
+		}
+
+		public static void PinToBottom(this AppWindowViewModel appWindow, List<IntPtr> pinnedList)
+		{
+			if (appWindow.IsPinnedToBottom(pinnedList))
+				return;
+
+			pinnedList.Add(appWindow.HWnd);
+		}
+
+		public static void UnpinFromBottom(this AppWindowViewModel appWindow, List<IntPtr> pinnedList)
+		{
+			if (!appWindow.IsPinnedToBottom(pinnedList))
+				return;
+
+			pinnedList.RemoveAll(ptr => (long) ptr == (long) appWindow.HWnd);
+		}
+
+		public static List<AppWindowViewModel> Sort(this IEnumerable<AppWindowViewModel> windowList,
+			SystemWindow foregroundWindow, IEnumerable<IntPtr> pinnedList)
+		{
+			var result = new List<AppWindowViewModel>();
+
+			var windowArray = windowList as AppWindowViewModel[] ?? windowList.ToArray();
+			result.AddRange(windowArray.Where(w => !w.IsPinnedToBottom(pinnedList)));
+			result.AddRange(windowArray.Where(w => w.IsPinnedToBottom(pinnedList)));
+
+			var firstWindow = result.FirstOrDefault();
+
+			if (firstWindow != null && firstWindow.AppWindow.IsRelatedTo(foregroundWindow))
+			{
+				result.RemoveAt(0);
+				result.Add(firstWindow);
+			}
+
+			return result;
+		}
+
+		public static bool IsRelatedTo(this SystemWindow window1, SystemWindow window2)
+		{
+			return window1.HasTheSameHandleAs(window2) || window1.HasTheSameProcessIdAs(window2);
+		}
+
+		public static bool HasTheSameHandleAs(this SystemWindow window1, SystemWindow window2)
+		{
+
+            return window1.HWnd == window2.HWnd;
+		}
+
+		public static bool HasTheSameProcessIdAs(this SystemWindow window1, SystemWindow window2)
+		{
+			return window1.Process.Id == window2.Process.Id;
+		}
+	}
+}

Switcheroo/MainWindow.xaml

@@ -18,6 +18,10 @@
                         Executed="ScrollListUp" />
         <CommandBinding Command="local:MainWindow.ScrollListDownCommand"
                         Executed="ScrollListDown" />
+        <CommandBinding Command="local:MainWindow.PinToBottomCommand" 
+                        Executed="PinCommand" />
+        <CommandBinding Command="local:MainWindow.UnpinFromBottomCommand"
+                        Executed="UnpinCommand"/>
     </Window.CommandBindings>
 
     <Window.InputBindings>
@@ -30,6 +34,16 @@
     <Window.Resources>
         <local:WindowHandleToIconConverter x:Key="WindowHandleToIconConverter" />
         <local:WindowHandleToCachedIconConverter x:Key="WindowHandleToCachedIconConverter" />
+        <ContextMenu x:Key="CmPinToBottom">
+            <MenuItem Command="local:MainWindow.PinToBottomCommand">
+                <MenuItem.Icon>
+                    <Image Source="Resources/pin.png"></Image>
+                </MenuItem.Icon>
+            </MenuItem>
+        </ContextMenu>
+        <ContextMenu x:Key="CmUnpinFromBottom">
+            <MenuItem Command="local:MainWindow.UnpinFromBottomCommand"/>
+        </ContextMenu>
     </Window.Resources>
 
     <Border Padding="3" Background="White" BorderBrush="DarkGray" BorderThickness="1" Name="Border">
@@ -199,6 +213,7 @@
                     <Style TargetType="{x:Type ListBoxItem}" BasedOn="{StaticResource {x:Type ListBoxItem}}">
                         <Setter Property="Padding" Value="0,5" />
                         <EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
+                        <EventSetter Event="MouseRightButtonUp" Handler="ListBoxItem_MouseRightClick" />
                     </Style>
                 </ListBox.ItemContainerStyle>
                 <!-- Changes inactive selection color to be same as selected -->

Switcheroo/MainWindow.xaml.cs

@@ -39,6 +39,7 @@
 using Switcheroo.Core.Matchers;
 using Switcheroo.Properties;
 using Application = System.Windows.Application;
+using ContextMenu = System.Windows.Controls.ContextMenu;
 using MenuItem = System.Windows.Forms.MenuItem;
 using MessageBox = System.Windows.MessageBox;
 
@@ -56,10 +57,13 @@ public partial class MainWindow : Window
         public static readonly RoutedUICommand SwitchToWindowCommand = new RoutedUICommand();
         public static readonly RoutedUICommand ScrollListDownCommand = new RoutedUICommand();
         public static readonly RoutedUICommand ScrollListUpCommand = new RoutedUICommand();
+        public static readonly RoutedUICommand PinToBottomCommand = new RoutedUICommand("Pin To Bottom", "PinToBottom", typeof(AppWindowViewModel), new InputGestureCollection {new KeyGesture(Key.L, ModifierKeys.Control)});
+        public static readonly RoutedUICommand UnpinFromBottomCommand = new RoutedUICommand("Unpin From Bottom", "UnpinFromBottom", typeof(MainWindow), new InputGestureCollection {new KeyGesture(Key.H, ModifierKeys.Control)});
         private OptionsWindow _optionsWindow;
         private AboutWindow _aboutWindow;
         private AltTabHook _altTabHook;
         private SystemWindow _foregroundWindow;
+	    private List<IntPtr> _pinnedToBottom = new List<IntPtr>();
 
         public MainWindow()
         {
@@ -247,19 +251,7 @@ private static async Task<Version> GetLatestVersion()
         /// </summary>
         private void LoadData(InitialFocus focus)
         {
-            _unfilteredWindowList = new WindowFinder().GetWindows().Select(window => new AppWindowViewModel(window)).ToList();
-
-            var firstWindow = _unfilteredWindowList.FirstOrDefault();
-
-            var foregroundWindowMovedToBottom = false;
-
-            // Move first window to the bottom of the list if it's related to the foreground window
-            if (firstWindow != null && AreWindowsRelated(firstWindow.AppWindow, _foregroundWindow))
-            {
-                _unfilteredWindowList.RemoveAt(0);
-                _unfilteredWindowList.Add(firstWindow);
-                foregroundWindowMovedToBottom = true;
-            }
+            _unfilteredWindowList = new WindowFinder().GetWindows().Select(window => new AppWindowViewModel(window)).Sort(_foregroundWindow, _pinnedToBottom);
 
             _filteredWindowList = new ObservableCollection<AppWindowViewModel>(_unfilteredWindowList);
             _windowCloser = new WindowCloser();
@@ -274,25 +266,21 @@ private void LoadData(InitialFocus focus)
             lb.DataContext = null;
             lb.DataContext = _filteredWindowList;
 
-            FocusItemInList(focus, foregroundWindowMovedToBottom);
+            FocusItemInList(focus, _foregroundWindow);
 
             tb.Clear();
             tb.Focus();
             CenterWindow();
             ScrollSelectedItemIntoView();
         }
 
-        private static bool AreWindowsRelated(SystemWindow window1, SystemWindow window2)
-        {
-            return window1.HWnd == window2.HWnd || window1.Process.Id == window2.Process.Id;
-        }
-
-        private void FocusItemInList(InitialFocus focus, bool foregroundWindowMovedToBottom)
+        private void FocusItemInList(InitialFocus focus, SystemWindow foregroundWindow)
         {
             if (focus == InitialFocus.PreviousItem)
             {
                 var previousItemIndex = lb.Items.Count - 1;
-                if (foregroundWindowMovedToBottom)
+	            lb.SelectedIndex = previousItemIndex;
+                if ((lb.SelectedItem as AppWindowViewModel).AppWindow.HasTheSameHandleAs(foregroundWindow))
                 {
                     previousItemIndex--;
                 }
@@ -673,6 +661,49 @@ private void ShowHelpTextBlock_OnPreviewMouseDown(object sender, MouseButtonEven
             HelpPanel.BeginAnimation(HeightProperty, new DoubleAnimation(HelpPanel.Height, newHeight, duration));
         }
 
+	    private void ListBoxItem_MouseRightClick(object sender, MouseButtonEventArgs e)
+	    {
+		    var appWindow = (sender as ListBoxItem).Content as AppWindowViewModel;
+
+	        if (appWindow.IsPinnedToBottom(_pinnedToBottom))
+	        {
+	            var cmUnpinFromBottom = this.FindResource("CmUnpinFromBottom") as ContextMenu;
+	            cmUnpinFromBottom.PlacementTarget = sender as ListBoxItem;
+	            cmUnpinFromBottom.IsOpen = true;
+	            return;
+	        }
+
+	        var cmPinToBottom = this.FindResource("CmPinToBottom") as ContextMenu;
+	        cmPinToBottom.PlacementTarget = sender as ListBoxItem;
+	        cmPinToBottom.IsOpen = true;
+	    }
+
+	    private void PinCommand(object sender, ExecutedRoutedEventArgs e)
+	    {
+            var appWindow = lb.SelectedItem as AppWindowViewModel;
+
+            appWindow.PinToBottom(_pinnedToBottom);
+
+			ReorderList();
+	    }
+
+	    private void UnpinCommand(object sender, ExecutedRoutedEventArgs e)
+	    {
+            var appWindow = lb.SelectedItem as AppWindowViewModel;
+
+            appWindow.UnpinFromBottom(_pinnedToBottom);
+
+			ReorderList();
+	    }
+
+	    private void ReorderList()
+	    {
+		    var windows = lb.Items.Cast<AppWindowViewModel>().Sort(_foregroundWindow, _pinnedToBottom);
+
+		    lb.DataContext = windows;
+		    lb.SelectedIndex = 0;
+	    }
+
         #endregion
 
         private enum InitialFocus

Switcheroo/Properties/Resources.resx

@@ -121,4 +121,7 @@
   <data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="pin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pin.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

Switcheroo/Switcheroo.csproj

@@ -94,6 +94,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="AppWindowViewModel.cs" />
+    <Compile Include="Extensions.cs" />
     <Compile Include="IconToBitmapConverter.cs" />
     <Compile Include="BoolToWhateverConverter.cs" />
     <Compile Include="WindowCloser.cs" />
@@ -212,6 +213,9 @@
   <ItemGroup>
     <Resource Include="icon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\pin.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!--<Import Project="$(ProgramFiles)\MSBuild\Microsoft\StyleCop\v4.3\Microsoft.StyleCop.targets" />-->
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.