CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-02 21:20:28 +12:00
Code Issues Packages Projects Releases Wiki Activity

#5055: Fix custom cursor sizes

Browse source
This commit is contained in:
Jaex 2022-06-29 18:07:08 +03:00
parent 0b8089d5be
commit a140c6eac5
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
ShareX.HelpersLib/CursorData.cs
View file

@ -33,9 +33,10 @@ public class CursorData
{ {
public IntPtr Handle { get; private set; } public IntPtr Handle { get; private set; }
public Point Position { get; private set; } public Point Position { get; private set; }
public Size Size { get; private set; }
public float SizeMultiplier { get; private set; }
public Point Hotspot { get; private set; } public Point Hotspot { get; private set; }
public Point DrawPosition => new Point(Position.X - Hotspot.X, Position.Y - Hotspot.Y); public Point DrawPosition => new Point(Position.X - Hotspot.X, Position.Y - Hotspot.Y);
public Size BaseSize { get; private set; }
public bool IsVisible { get; private set; } public bool IsVisible { get; private set; }
public CursorData() public CursorData()
@ -56,7 +57,8 @@ public void UpdateCursorData()
{ {
Handle = cursorInfo.hCursor; Handle = cursorInfo.hCursor;
Position = cursorInfo.ptScreenPos; Position = cursorInfo.ptScreenPos;
BaseSize = GetCursorBaseSize(); Size = Size.Empty;
SizeMultiplier = GetCursorSizeMultiplier();
IsVisible = cursorInfo.flags == NativeConstants.CURSOR_SHOWING; IsVisible = cursorInfo.flags == NativeConstants.CURSOR_SHOWING;
if (IsVisible) if (IsVisible)
@ -67,25 +69,24 @@ public void UpdateCursorData()
{ {
if (NativeMethods.GetIconInfo(iconHandle, out IconInfo iconInfo)) if (NativeMethods.GetIconInfo(iconHandle, out IconInfo iconInfo))
{ {
if (BaseSize.IsEmpty) Hotspot = new Point((int)Math.Round(iconInfo.xHotspot * SizeMultiplier), (int)Math.Round(iconInfo.yHotspot * SizeMultiplier));
{
Hotspot = new Point(iconInfo.xHotspot, iconInfo.yHotspot);
}
else
{
float multiplier = BaseSize.Width / 32f;
Hotspot = new Point((int)Math.Round(iconInfo.xHotspot * multiplier), (int)Math.Round(iconInfo.yHotspot * multiplier));
}
if (iconInfo.hbmMask != IntPtr.Zero)
{
NativeMethods.DeleteObject(iconInfo.hbmMask);
}
if (iconInfo.hbmColor != IntPtr.Zero) if (iconInfo.hbmColor != IntPtr.Zero)
{ {
NativeMethods.DeleteObject(iconInfo.hbmColor); NativeMethods.DeleteObject(iconInfo.hbmColor);
} }
if (iconInfo.hbmMask != IntPtr.Zero)
{
using (Bitmap bmpMask = Image.FromHbitmap(iconInfo.hbmMask))
{
int cursorWidth = bmpMask.Width;
int cursorHeight = iconInfo.hbmColor != IntPtr.Zero ? bmpMask.Height : bmpMask.Height / 2;
Size = new Size((int)Math.Round(cursorWidth * SizeMultiplier), (int)Math.Round(cursorHeight * SizeMultiplier));
}
NativeMethods.DeleteObject(iconInfo.hbmMask);
}
} }
NativeMethods.DestroyIcon(iconHandle); NativeMethods.DestroyIcon(iconHandle);
@ -94,17 +95,20 @@ public void UpdateCursorData()
} }
} }
public static Size GetCursorBaseSize() public static float GetCursorSizeMultiplier()
{ {
float sizeMultiplier = 1f;
try try
{ {
int cursorBaseSize = RegistryHelpers.GetValueDWord(@"Control Panel\Cursors", "CursorBaseSize"); int cursorSize = RegistryHelpers.GetValueDWord(@"SOFTWARE\Microsoft\Accessibility", "CursorSize");
return new Size(cursorBaseSize, cursorBaseSize); sizeMultiplier = 1f + ((cursorSize - 1) * 0.5f);
} }
catch catch
{ {
return Size.Empty;
} }
return sizeMultiplier;
} }
public void DrawCursor(IntPtr hdcDest) public void DrawCursor(IntPtr hdcDest)
@ -119,7 +123,7 @@ public void DrawCursor(IntPtr hdcDest, Point offset)
Point drawPosition = new Point(DrawPosition.X - offset.X, DrawPosition.Y - offset.Y); Point drawPosition = new Point(DrawPosition.X - offset.X, DrawPosition.Y - offset.Y);
drawPosition = CaptureHelpers.ScreenToClient(drawPosition); drawPosition = CaptureHelpers.ScreenToClient(drawPosition);
NativeMethods.DrawIconEx(hdcDest, drawPosition.X, drawPosition.Y, Handle, BaseSize.Width, BaseSize.Height, 0, IntPtr.Zero, NativeConstants.DI_NORMAL); NativeMethods.DrawIconEx(hdcDest, drawPosition.X, drawPosition.Y, Handle, Size.Width, Size.Height, 0, IntPtr.Zero, NativeConstants.DI_NORMAL);
} }
} }
@ -147,13 +151,13 @@ public Bitmap ToBitmap()
{ {
Size cursorSize; Size cursorSize;
if (BaseSize.IsEmpty) if (Size.IsEmpty)
{ {
cursorSize = new Size(32, 32); cursorSize = new Size(32, 32);
} }
else else
{ {
cursorSize = BaseSize; cursorSize = Size;
} }
Bitmap bmp = new Bitmap(cursorSize.Width, cursorSize.Height); Bitmap bmp = new Bitmap(cursorSize.Width, cursorSize.Height);