Skip to content

Fix cursor editor icon width calculation for proper DPI scaling #14168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix cursor editor icon width calculation for proper DPI scaling #14168

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
82a49a3
Initial plan
Copilot Dec 24, 2025
b97e719
Fix cursor editor ItemHeight calculation for proper DPI scaling
Copilot Dec 24, 2025
7fbcc9d
Address code review: Use DPI-scaled constants in OnDrawItem for consi…
Copilot Dec 24, 2025
c255ef2
Fix text positioning to account for margin offset
Copilot Dec 24, 2025
cdf6bd6
Clarify LogicalItemPadding comment to indicate total vertical padding
Copilot Dec 24, 2025
82db747
Standardize image width to resolve the issue of curve list distortion.
Dec 26, 2025
580788c
Optimize code
Jan 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/System.Windows.Forms.Design/src/System/Drawing/Design/CursorEditor.CursorUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ private class CursorUI : ListBox
{
private IWindowsFormsEditorService? _editorService;
private readonly TypeConverter _cursorConverter;
private readonly int _cursorWidth;

public CursorUI()
{
Expand All @@ -38,6 +39,8 @@ public CursorUI()
Items.Add(obj);
}
}

_cursorWidth = ScaleHelper.ScaleSmallIconToDpi(Icon.FromHandle(Cursors.Default.Handle), DeviceDpi).Size.Width;
}

public object? Value { get; private set; }
Expand Down Expand Up @@ -65,14 +68,13 @@ protected override void OnDrawItem(DrawItemEventArgs e)
string? text = _cursorConverter.ConvertToString(cursor);
Font font = e.Font!;
using var brushText = e.ForeColor.GetCachedSolidBrushScope();
var cursorWidth = ScaleHelper.ScaleSmallIconToDpi(Icon.FromHandle(cursor.Handle), DeviceDpi).Size.Width;

e.DrawBackground();
e.Graphics.FillRectangle(SystemBrushes.Control, new Rectangle(e.Bounds.X + 2, e.Bounds.Y + 2, cursorWidth, e.Bounds.Height - 4));
e.Graphics.DrawRectangle(SystemPens.WindowText, new Rectangle(e.Bounds.X + 2, e.Bounds.Y + 2, cursorWidth - 1, e.Bounds.Height - 4 - 1));
e.Graphics.FillRectangle(SystemBrushes.Control, new Rectangle(e.Bounds.X + 2, e.Bounds.Y + 2, _cursorWidth, e.Bounds.Height - 4));
e.Graphics.DrawRectangle(SystemPens.WindowText, new Rectangle(e.Bounds.X + 2, e.Bounds.Y + 2, _cursorWidth - 1, e.Bounds.Height - 4 - 1));

cursor.DrawStretched(e.Graphics, new Rectangle(e.Bounds.X + 2, e.Bounds.Y + 2, cursorWidth, e.Bounds.Height - 4));
e.Graphics.DrawString(text, font, brushText, e.Bounds.X + cursorWidth + 4, e.Bounds.Y + (e.Bounds.Height - font.Height) / 2);
cursor.DrawStretched(e.Graphics, new Rectangle(e.Bounds.X + 2, e.Bounds.Y + 2, _cursorWidth, e.Bounds.Height - 4));
e.Graphics.DrawString(text, font, brushText, e.Bounds.X + _cursorWidth + 4, e.Bounds.Y + (e.Bounds.Height - font.Height) / 2);
}
}

Expand Down
Loading