From cdd8c793c9699731db52a7c2e61ae99052a11e22 Mon Sep 17 00:00:00 2001
From: Ryan Knittel <ryan.knittel@gmail.com>
Date: Fri, 12 Feb 2016 17:45:42 -0800
Subject: [PATCH] Removed the "jittering" when the sidebar is setting its
 position with "Reserve Space" enabled. Also added cycle edge and screen
 hotkeys.

---
 SidebarDiagnostics/Dummy.xaml.cs    |   4 +-
 SidebarDiagnostics/Settings.xaml    |  10 ++
 SidebarDiagnostics/Settings.xaml.cs |  36 +++++++
 SidebarDiagnostics/SettingsModel.cs |  48 ++++++++-
 SidebarDiagnostics/Setup.xaml.cs    |   4 +-
 SidebarDiagnostics/Sidebar.xaml.cs  |  58 ++++++----
 SidebarDiagnostics/Windows.cs       | 158 +++++++++++++++++++++-------
 7 files changed, 254 insertions(+), 64 deletions(-)

diff --git a/SidebarDiagnostics/Dummy.xaml.cs b/SidebarDiagnostics/Dummy.xaml.cs
index e17cb48..c2ebbec 100644
--- a/SidebarDiagnostics/Dummy.xaml.cs
+++ b/SidebarDiagnostics/Dummy.xaml.cs
@@ -16,7 +16,7 @@ public Dummy()
             InitializeComponent();
         }
 
-        public void Position()
+        public void Reposition()
         {
             int _screen;
             DockEdge _edge;
@@ -33,7 +33,7 @@ public void Position()
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
         {
-            Position();
+            Reposition();
         }
     }
 }
diff --git a/SidebarDiagnostics/Settings.xaml b/SidebarDiagnostics/Settings.xaml
index a02a680..7e88fcc 100644
--- a/SidebarDiagnostics/Settings.xaml
+++ b/SidebarDiagnostics/Settings.xaml
@@ -319,6 +319,8 @@
                         <RowDefinition Height="38px"></RowDefinition>
                         <RowDefinition Height="38px"></RowDefinition>
                         <RowDefinition Height="38px"></RowDefinition>
+                        <RowDefinition Height="38px"></RowDefinition>
+                        <RowDefinition Height="38px"></RowDefinition>
                     </Grid.RowDefinitions>
 
                     <Label Grid.Column="0" Grid.Row="0" Content="Toggle" />
@@ -340,6 +342,14 @@
                     <Label Grid.Column="0" Grid.Row="4" Content="Close" />
                     <ToggleButton Grid.Column="1" Grid.Row="4" Click="BindClose_Click" LostFocus="BindButton_LostFocus" Style="{StaticResource HotkeyToggle}" />
                     <TextBox Grid.Column="2" Grid.Row="4" Text="{Binding Path=CloseKey, Mode=OneWay, Converter={StaticResource HotkeyConverter}}" Style="{StaticResource HotkeyLabel}" />
+
+                    <Label Grid.Column="0" Grid.Row="5" Content="Cycle Edge" />
+                    <ToggleButton Grid.Column="1" Grid.Row="5" Click="BindCycleEdge_Click" LostFocus="BindButton_LostFocus" Style="{StaticResource HotkeyToggle}" />
+                    <TextBox Grid.Column="2" Grid.Row="5" Text="{Binding Path=CycleEdgeKey, Mode=OneWay, Converter={StaticResource HotkeyConverter}}" Style="{StaticResource HotkeyLabel}" />
+
+                    <Label Grid.Column="0" Grid.Row="6" Content="Cycle Screen" />
+                    <ToggleButton Grid.Column="1" Grid.Row="6" Click="BindCycleScreen_Click" LostFocus="BindButton_LostFocus" Style="{StaticResource HotkeyToggle}" />
+                    <TextBox Grid.Column="2" Grid.Row="6" Text="{Binding Path=CycleScreenKey, Mode=OneWay, Converter={StaticResource HotkeyConverter}}" Style="{StaticResource HotkeyLabel}" />
                 </Grid>
             </TabItem>
         </TabControl>
diff --git a/SidebarDiagnostics/Settings.xaml.cs b/SidebarDiagnostics/Settings.xaml.cs
index 81e68e6..5f8d97b 100644
--- a/SidebarDiagnostics/Settings.xaml.cs
+++ b/SidebarDiagnostics/Settings.xaml.cs
@@ -183,6 +183,34 @@ private void BindClose_Click(object sender, RoutedEventArgs e)
             }
         }
 
+        private void BindCycleEdge_Click(object sender, RoutedEventArgs e)
+        {
+            _keybinder = (ToggleButton)sender;
+
+            if (_keybinder.IsChecked == true)
+            {
+                BeginBind(Hotkey.KeyAction.CycleEdge);
+            }
+            else
+            {
+                EndBind();
+            }
+        }
+
+        private void BindCycleScreen_Click(object sender, RoutedEventArgs e)
+        {
+            _keybinder = (ToggleButton)sender;
+
+            if (_keybinder.IsChecked == true)
+            {
+                BeginBind(Hotkey.KeyAction.CycleScreen);
+            }
+            else
+            {
+                EndBind();
+            }
+        }
+
         private void BeginBind(Hotkey.KeyAction action)
         {
             _hotkey = new Hotkey();
@@ -224,6 +252,14 @@ private void EndBind()
                 case Hotkey.KeyAction.Close:
                     Model.CloseKey = _hotkey;
                     break;
+
+                case Hotkey.KeyAction.CycleEdge:
+                    Model.CycleEdgeKey = _hotkey;
+                    break;
+
+                case Hotkey.KeyAction.CycleScreen:
+                    Model.CycleScreenKey = _hotkey;
+                    break;
             }
 
             _keybinder.IsChecked = false;
diff --git a/SidebarDiagnostics/SettingsModel.cs b/SidebarDiagnostics/SettingsModel.cs
index 06966dd..7e3f815 100644
--- a/SidebarDiagnostics/SettingsModel.cs
+++ b/SidebarDiagnostics/SettingsModel.cs
@@ -103,14 +103,12 @@ select config
             if (Framework.Settings.Instance.Hotkeys != null)
             {
                 ToggleKey = Framework.Settings.Instance.Hotkeys.FirstOrDefault(k => k.Action == Hotkey.KeyAction.Toggle);
-
                 ShowKey = Framework.Settings.Instance.Hotkeys.FirstOrDefault(k => k.Action == Hotkey.KeyAction.Show);
-
                 HideKey = Framework.Settings.Instance.Hotkeys.FirstOrDefault(k => k.Action == Hotkey.KeyAction.Hide);
-
                 ReloadKey = Framework.Settings.Instance.Hotkeys.FirstOrDefault(k => k.Action == Hotkey.KeyAction.Reload);
-
                 CloseKey = Framework.Settings.Instance.Hotkeys.FirstOrDefault(k => k.Action == Hotkey.KeyAction.Close);
+                CycleEdgeKey = Framework.Settings.Instance.Hotkeys.FirstOrDefault(k => k.Action == Hotkey.KeyAction.CycleEdge);
+                CycleScreenKey = Framework.Settings.Instance.Hotkeys.FirstOrDefault(k => k.Action == Hotkey.KeyAction.CycleScreen);
             }
 
             IsChanged = false;
@@ -170,6 +168,16 @@ public void Save()
                 _hotkeys.Add(CloseKey);
             }
 
+            if (CycleEdgeKey != null)
+            {
+                _hotkeys.Add(CycleEdgeKey);
+            }
+
+            if (CycleScreenKey != null)
+            {
+                _hotkeys.Add(CycleScreenKey);
+            }
+
             Framework.Settings.Instance.Hotkeys = _hotkeys.ToArray();
 
             Framework.Settings.Instance.Save();
@@ -774,6 +782,38 @@ public Hotkey CloseKey
                 NotifyPropertyChanged("CloseKey");
             }
         }
+
+        private Hotkey _cycleEdgeKey { get; set; }
+
+        public Hotkey CycleEdgeKey
+        {
+            get
+            {
+                return _cycleEdgeKey;
+            }
+            set
+            {
+                _cycleEdgeKey = value;
+
+                NotifyPropertyChanged("CycleEdgeKey");
+            }
+        }
+
+        private Hotkey _cycleScreenKey { get; set; }
+
+        public Hotkey CycleScreenKey
+        {
+            get
+            {
+                return _cycleScreenKey;
+            }
+            set
+            {
+                _cycleScreenKey = value;
+
+                NotifyPropertyChanged("CycleScreenKey");
+            }
+        }
     }
 
     public class ScreenItem
diff --git a/SidebarDiagnostics/Setup.xaml.cs b/SidebarDiagnostics/Setup.xaml.cs
index 3fdc827..f2c9db4 100644
--- a/SidebarDiagnostics/Setup.xaml.cs
+++ b/SidebarDiagnostics/Setup.xaml.cs
@@ -55,7 +55,7 @@ private void Yes_Click(object sender, RoutedEventArgs e)
 
                 case Page.BeginHighDPI:
                     Framework.Settings.Instance.HighDPISupport = true;
-                    Sidebar.Position();
+                    Sidebar.Reposition();
                     ShowPage(Page.EndHighDPI);
                     return;
             }
@@ -97,7 +97,7 @@ private void OffsetSlider_ValueChanged(object sender, RoutedPropertyChangedEvent
                     Framework.Settings.Instance.XOffset = (int)XOffsetSlider.Value;
                     Framework.Settings.Instance.YOffset = (int)YOffsetSlider.Value;
 
-                    Sidebar.Position();
+                    Sidebar.Reposition();
                 }));
 
                 _cancelReposition = null;
diff --git a/SidebarDiagnostics/Sidebar.xaml.cs b/SidebarDiagnostics/Sidebar.xaml.cs
index 743dc19..64fa8c0 100644
--- a/SidebarDiagnostics/Sidebar.xaml.cs
+++ b/SidebarDiagnostics/Sidebar.xaml.cs
@@ -48,6 +48,18 @@ public void Reset(bool enableHotkeys)
             new BindModelHandler(BindModel).BeginInvoke(null, null);
         }
 
+        public void Reposition()
+        {
+            if (!Ready)
+            {
+                return;
+            }
+
+            Ready = false;
+
+            BindPosition(() => Ready = true);
+        }
+
         private void Initialize()
         {
             Ready = false;
@@ -66,26 +78,7 @@ private void Initialize()
 
         private void BindSettings(bool enableHotkeys)
         {
-            int _screen;
-            DockEdge _edge;
-            WorkArea _windowWA;
-            WorkArea _appbarWA;
-
-            Monitor.GetWorkArea(this, out _screen, out _edge, out _windowWA, out _appbarWA);
-
-            Left = _windowWA.Left;
-            Top = _windowWA.Top;
-            Width = _windowWA.Width;
-            Height = _windowWA.Height;
-
-            if (Framework.Settings.Instance.UseAppBar)
-            {
-                SetAppBar(_screen, _edge, _windowWA, _appbarWA);
-            }
-            else
-            {
-                ClearAppBar();
-            }
+            BindPosition(null);
 
             if (Framework.Settings.Instance.AlwaysTop)
             {
@@ -113,6 +106,31 @@ private void BindSettings(bool enableHotkeys)
             }
         }
 
+        private void BindPosition(Action callback)
+        {
+            if (IsAppBar)
+            {
+                ClearAppBar();
+            }
+
+            int _screen;
+            DockEdge _edge;
+            WorkArea _windowWA;
+            WorkArea _appbarWA;
+
+            Monitor.GetWorkArea(this, out _screen, out _edge, out _windowWA, out _appbarWA);
+
+            Left = _windowWA.Left;
+            Top = _windowWA.Top;
+            Width = _windowWA.Width;
+            Height = _windowWA.Height;
+
+            if (Framework.Settings.Instance.UseAppBar)
+            {
+                SetAppBar(_screen, _edge, _windowWA, _appbarWA, callback);
+            }
+        }
+
         private delegate void BindModelHandler();
 
         private void BindModel()
diff --git a/SidebarDiagnostics/Windows.cs b/SidebarDiagnostics/Windows.cs
index 8b85a2e..0e46f57 100644
--- a/SidebarDiagnostics/Windows.cs
+++ b/SidebarDiagnostics/Windows.cs
@@ -250,7 +250,9 @@ public enum KeyAction : byte
             Show,
             Hide,
             Reload,
-            Close
+            Close,
+            CycleEdge,
+            CycleScreen
         }
 
         public Hotkey() { }
@@ -317,7 +319,7 @@ public static void Initialize(Sidebar window, Hotkey[] settings)
                 return h;
             }).ToArray();
 
-            (PresentationSource.FromVisual(window) as HwndSource).AddHook(KeyHook);
+            window.HwndSource.AddHook(KeyHook);
         }
 
         public static void Enable()
@@ -426,10 +428,43 @@ private static IntPtr KeyHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam
                         case KeyAction.Close:
                             Application.Current.Shutdown();
                             break;
+
+                        case KeyAction.CycleEdge:
+                            switch (Framework.Settings.Instance.DockEdge)
+                            {
+                                case DockEdge.Right:
+                                    Framework.Settings.Instance.DockEdge = DockEdge.Left;
+                                    break;
+
+                                default:
+                                case DockEdge.Left:
+                                    Framework.Settings.Instance.DockEdge = DockEdge.Right;
+                                    break;
+                            }
+
+                            Framework.Settings.Instance.Save();
+
+                            _window.Reposition();
+                            break;
+
+                        case KeyAction.CycleScreen:
+                            Monitor[] _monitors = Monitor.GetMonitors();
+
+                            if (Framework.Settings.Instance.ScreenIndex < (_monitors.Length - 1))
+                            {
+                                Framework.Settings.Instance.ScreenIndex++;
+                            }
+                            else
+                            {
+                                Framework.Settings.Instance.ScreenIndex = 0;
+                            }
+
+                            Framework.Settings.Instance.Save();
+
+                            _window.Reposition();
+                            break;
                     }
                 }
-
-                handled = true;
             }
 
             return IntPtr.Zero;
@@ -724,14 +759,6 @@ public void HandleDPI()
             UpdateScale(_uiScale, _uiScale, true);
         }
 
-        private void UIScale_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == "UIScale")
-            {
-                HandleDPI();
-            }
-        }
-
         public void UpdateScale(double scaleX, double scaleY, bool resize)
         {
             if (VisualChildrenCount > 0)
@@ -753,23 +780,39 @@ public void UpdateScale(double scaleX, double scaleY, bool resize)
 
         private void DPIAwareWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            Framework.Settings.Instance.PropertyChanged += UIScale_PropertyChanged;
-
             HandleDPI();
 
-            (PresentationSource.FromVisual(this) as HwndSource).AddHook(WindowHook);
+            Framework.Settings.Instance.PropertyChanged += UIScale_PropertyChanged;
+
+            //HwndSource.AddHook(WindowHook);
         }
 
-        private IntPtr WindowHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        private void UIScale_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (msg == WM_MESSAGES.WM_DPICHANGED)
+            if (e.PropertyName == "UIScale")
             {
                 HandleDPI();
-
-                handled = true;
             }
+        }
 
-            return IntPtr.Zero;
+        //private IntPtr WindowHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        //{
+        //    if (msg == WM_MESSAGES.WM_DPICHANGED)
+        //    {
+        //        HandleDPI();
+
+        //        handled = true;
+        //    }
+
+        //    return IntPtr.Zero;
+        //}
+
+        public HwndSource HwndSource
+        {
+            get
+            {
+                return (HwndSource)PresentationSource.FromVisual(this);
+            }
         }
 
         public static readonly DependencyProperty AutoDPIProperty = DependencyProperty.Register("AutoDPI", typeof(bool), typeof(DPIAwareWindow), new UIPropertyMetadata(true));
@@ -878,6 +921,24 @@ private static class WND_STYLE
             public const int WS_EX_TRANSPARENT = 32;
         }
 
+        private static class WM_WINDOWPOSCHANGING
+        {
+            public const int MSG = 0x0046;
+            public const int SWP_NOMOVE = 0x0002;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct WINDOWPOS
+        {
+            public IntPtr hWnd;
+            public IntPtr hWndInsertAfter;
+            public int x;
+            public int y;
+            public int cx;
+            public int cy;
+            public uint flags;
+        }
+
         public void SetTop()
         {
             NativeMethods.SetWindowPos(
@@ -933,7 +994,33 @@ public void ClearClickThrough()
             NativeMethods.SetWindowLongPtr(_hwnd, WND_STYLE.GWL_EXSTYLE, _style & ~WND_STYLE.WS_EX_TRANSPARENT);
         }
 
-        public void SetAppBar(int screen, DockEdge edge, WorkArea windowWA, WorkArea appbarWA)
+        public void PreventMove()
+        {
+            HwndSource.AddHook(MoveHook);
+        }
+
+        public void AllowMove()
+        {
+            HwndSource.RemoveHook(MoveHook);
+        }
+
+        private IntPtr MoveHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == WM_WINDOWPOSCHANGING.MSG)
+            {
+                WINDOWPOS _pos = (WINDOWPOS)Marshal.PtrToStructure(lParam, typeof(WINDOWPOS));
+
+                _pos.flags |= WM_WINDOWPOSCHANGING.SWP_NOMOVE;
+
+                Marshal.StructureToPtr(_pos, lParam, true);
+
+                handled = true;
+            }
+
+            return IntPtr.Zero;
+        }
+
+        public void SetAppBar(int screen, DockEdge edge, WorkArea windowWA, WorkArea appbarWA, Action callback)
         {
             if (edge == DockEdge.None)
             {
@@ -954,7 +1041,7 @@ public void SetAppBar(int screen, DockEdge edge, WorkArea windowWA, WorkArea app
             Screen = screen;
             DockEdge = edge;
 
-            DockAppBar(edge, windowWA, appbarWA);
+            DockAppBar(edge, windowWA, appbarWA, callback);
         }
 
         public void ClearAppBar()
@@ -964,8 +1051,7 @@ public void ClearAppBar()
                 return;
             }
 
-            _source.RemoveHook(AppBarHook);
-            _source = null;
+            HwndSource.RemoveHook(AppBarHook);
 
             APPBARDATA _data = NewData();
 
@@ -985,7 +1071,7 @@ public void AppBarShow()
 
                 Monitor.GetWorkArea(this, out _screen, out _edge, out _windowWA, out _appbarWA);
 
-                SetAppBar(_screen, _edge, _windowWA, _appbarWA);
+                SetAppBar(_screen, _edge, _windowWA, _appbarWA, null);
             }
 
             Show();
@@ -1011,8 +1097,10 @@ private APPBARDATA NewData()
             return _data;
         }
 
-        private void DockAppBar(DockEdge edge, WorkArea windowWA, WorkArea appbarWA)
+        private void DockAppBar(DockEdge edge, WorkArea windowWA, WorkArea appbarWA, Action callback)
         {
+            PreventMove();
+
             APPBARDATA _data = NewData();
             _data.uEdge = (int)edge;
             _data.rc = new RECT()
@@ -1034,16 +1122,16 @@ private void DockAppBar(DockEdge edge, WorkArea windowWA, WorkArea appbarWA)
 
             AppBarWidth = appbarWA.Width;
 
-            _source = HwndSource.FromHwnd(_data.hWnd);
-
             Dispatcher.BeginInvoke(DispatcherPriority.ApplicationIdle, (Action)(() =>
             {
-                Top = windowWA.Top;
-                Left = windowWA.Left;
-                Width = windowWA.Width;
-                Height = windowWA.Height;
+                AllowMove();
 
-                _source.AddHook(AppBarHook);
+                HwndSource.AddHook(AppBarHook);
+
+                if (callback != null)
+                {
+                    callback();
+                }
             }));
         }
 
@@ -1077,7 +1165,7 @@ private IntPtr AppBarHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, re
 
                                 Monitor.GetWorkArea(this, out _screen, out _edge, out _windowWA, out _appbarWA);
 
-                                SetAppBar(_screen, _edge, _windowWA, _appbarWA);
+                                SetAppBar(_screen, _edge, _windowWA, _appbarWA, null);
                             }));
 
                             _cancelReposition = null;
@@ -1117,8 +1205,6 @@ private IntPtr AppBarHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, re
 
         private int _prevZOrder { get; set; }
 
-        private HwndSource _source { get; set; }
-
         private CancellationTokenSource _cancelReposition { get; set; }
     }
 }
\ No newline at end of file