MovableForm: show mover control for frameless dragging

#1951

Source/Components/ImageGlass.Base/WinApi/MovableForm.cs → Source/Components/ImageGlass.UI/Forms/MovableForm.cs

@@ -17,10 +17,12 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+using ImageGlass.Base;
+using ImageGlass.Base.WinApi;
 using Windows.Win32;
 using Windows.Win32.Foundation;
 
-namespace ImageGlass.Base.WinApi;
+namespace ImageGlass.UI;
 
 
 /// <summary>
@@ -31,8 +33,10 @@ public class MovableForm
     private const int WM_NCLBUTTONDOWN = 0xA1;
     private const int HT_CAPTION = 0x2;
 
-    private readonly Form _form;
+    private readonly ModernForm _form;
     private bool _isKeyDown = true;
+    private Control? _moverControl = null;
+    private bool _isMoverControlDarkMode = true;
 
 
     #region Public props
@@ -42,6 +46,11 @@ public class MovableForm
     /// </summary>
     public bool EnableFreeMoving { get; set; } = true;
 
+    /// <summary>
+    /// Sets visibility of mover control.
+    /// </summary>
+    public bool ShowMover { get; set; } = false;
+
     /// <summary>
     /// Gets, sets the mouse button press for moving
     /// </summary>
@@ -64,56 +73,43 @@ public class MovableForm
     /// Initialize the MovableForm
     /// </summary>
     /// <param name="form">The form to make it movable</param>
-    public MovableForm(Form form) => _form = form;
+    public MovableForm(ModernForm form) => _form = form;
 
 
     #region Public methods
 
     /// <summary>
-    /// Enable moving ability on this form
+    /// Enable moving ability on the given controls
     /// </summary>
-    public void Enable()
+    /// <param name="controls"></param>
+    public void Enable(params Control[] controls)
     {
         _isKeyDown = Key == Keys.None;
 
         _form.KeyDown += Form_KeyDown;
         _form.KeyUp += Form_KeyUp;
         _form.MouseDown += Event_MouseDown;
-    }
 
-    /// <summary>
-    /// Enable moving ability on the given controls
-    /// </summary>
-    /// <param name="controls"></param>
-    public void Enable(params Control[] controls)
-    {
-        _isKeyDown = Key == Keys.None;
 
-        foreach (var item in controls)
+        foreach (var ctr in controls)
         {
-            item.MouseDown += Event_MouseDown;
+            ctr.MouseDown += Event_MouseDown;
         }
     }
 
     /// <summary>
-    /// Disable moving ability on this form
+    /// Disable moving ability on the given controls
     /// </summary>
-    public void Disable()
+    /// <param name="controls"></param>
+    public void Disable(params Control[] controls)
     {
         _form.KeyDown -= Form_KeyDown;
         _form.KeyUp -= Form_KeyUp;
         _form.MouseDown -= Event_MouseDown;
-    }
 
-    /// <summary>
-    /// Disable moving ability on the given controls
-    /// </summary>
-    /// <param name="controls"></param>
-    public void Disable(params Control[] controls)
-    {
-        foreach (var item in controls)
+        foreach (var ctr in controls)
         {
-            item.MouseDown -= Event_MouseDown;
+            ctr.MouseDown -= Event_MouseDown;
         }
     }
 
@@ -132,19 +128,28 @@ private void Form_KeyDown(object? sender, KeyEventArgs e)
         {
             _isKeyDown = e.KeyData == Key;
         }
+
+        if (_isKeyDown && ShowMover)
+        {
+            SetMoverControlVisibility(true);
+        }
     }
 
+
     private void Form_KeyUp(object? sender, KeyEventArgs e)
     {
         _isKeyDown = Key == Keys.None;
+        SetMoverControlVisibility(false);
     }
 
+
     private void Event_MouseDown(object? sender, MouseEventArgs e)
     {
         // check if 'sender' can move without keydown event
         var control = (Control?)sender;
-        var isFreeMove = FreeMoveControlNames.Count > 0
-            && FreeMoveControlNames.Contains(control.Name);
+        var isFreeMove = control.Name == _moverControl?.Name
+            || (FreeMoveControlNames.Count > 0
+                && FreeMoveControlNames.Contains(control.Name));
 
         if (e.Clicks == 1
             && e.Button == MouseButton
@@ -156,6 +161,52 @@ private void Event_MouseDown(object? sender, MouseEventArgs e)
         }
     }
 
+
+    private void SetMoverControlVisibility(bool visible)
+    {
+        if (_moverControl != null)
+        {
+            _form.Controls.Remove(_moverControl);
+            _moverControl.MouseDown -= Event_MouseDown;
+        }
+
+
+        if (visible)
+        {
+            _moverControl ??= new Panel()
+            {
+                Name = "PanMoverControl",
+                Width = DpiApi.Scale(100),
+                Height = DpiApi.Scale(100),
+                ForeColor = Color.White,
+                BackgroundImageLayout = ImageLayout.Center,
+                Cursor = Cursors.SizeAll,
+            };
+
+            // set movable icon
+            if (_moverControl.BackgroundImage == null || _isMoverControlDarkMode != _form.DarkMode)
+            {
+                _isMoverControlDarkMode = _form.DarkMode;
+
+                var iconSize = DpiApi.Scale(50);
+                var svgPath = IconFile.GetFullPath(IconName.ArrowMove);
+                _moverControl.BackgroundImage?.Dispose();
+                _moverControl.BackgroundImage = BHelper.ToGdiPlusBitmapFromSvg(svgPath, _form.DarkMode, iconSize, iconSize);
+            }
+
+            // set center position
+            _moverControl.Left = _form.Width / 2 - _moverControl.Width / 2;
+            _moverControl.Top = _form.Height / 2 - _moverControl.Height / 2 - SystemInformation.CaptionHeight;
+
+            // set mouse event
+            _moverControl.MouseDown += Event_MouseDown;
+
+            _form.Controls.Add(_moverControl);
+            _moverControl.BringToFront();
+        }
+    }
+
+
     #endregion // Events: Free form moving
 
 

Source/Components/ImageGlass.UI/NativeMethods.txt

@@ -2,3 +2,5 @@
 DwmIsCompositionEnabled
 DwmSetWindowAttribute
 DwmExtendFrameIntoClientArea
+ReleaseCapture
+SendMessage

Source/Components/ImageGlass.UI/Themes/IconFile.cs

@@ -74,5 +74,6 @@ public enum IconName
     ArrowDown,
     ArrowLeft,
     ArrowRight,
+    ArrowMove,
     ArrowExchange,
 }

Source/ImageGlass/FrmMain/FrmMain.IGMethods.cs

@@ -2418,6 +2418,13 @@ public bool IG_ToggleFrameless(bool? enable = null, bool showInAppMessage = true
             WindowApi.SetRoundCorner(Handle);
         }
 
+        // enable mover control
+        if (_movableForm != null)
+        {
+            _movableForm.ShowMover = Config.EnableFrameless;
+        }
+
+
         // update toolbar items state
         UpdateToolbarItemsState();
 
@@ -2775,13 +2782,11 @@ public void IG_SetWindowMoveable(bool? enable = null)
 
         if (enable.Value)
         {
-            _movableForm.Enable();
-            _movableForm.Enable(Toolbar, ToolbarContext, PicMain);
+            _movableForm.Enable(Toolbar, ToolbarContext);
         }
         else
         {
-            _movableForm.Disable();
-            _movableForm.Disable(Toolbar, ToolbarContext, PicMain);
+            _movableForm.Disable(Toolbar, ToolbarContext);
         }
     }
 

Source/ImageGlass/ImageGlass.csproj

@@ -125,6 +125,9 @@
         <Content Include="License\WicNet.txt">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
+        <None Update="Icons\ArrowMove.svg">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
         <None Update="License\ZString.txt">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>

Source/igcmd/Tools/FrmSlideshow.cs

@@ -1771,6 +1771,12 @@ private bool IG_ToggleFrameless(bool? enable = null, bool showInAppMessage = tru
         // update menu item state
         MnuFrameless.Checked = Config.EnableFrameless;
 
+        // enable mover control
+        if (_movableForm != null)
+        {
+            _movableForm.ShowMover = Config.EnableFrameless;
+        }
+
         if (showInAppMessage)
         {
             var langPath = $"FrmMain.{nameof(MnuFrameless)}";
@@ -1803,12 +1809,10 @@ public void IG_SetWindowMoveable(bool? enable = null)
         if (enable.Value)
         {
             _movableForm.Enable();
-            _movableForm.Enable(PicMain);
         }
         else
         {
             _movableForm.Disable();
-            _movableForm.Disable(PicMain);
         }
 
     }