Skip to content

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

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
SimonZhao888 wants to merge 2 commits into
base: main
Choose a base branch
from
+16 −5
Open

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15ce890
Fix cursor editor icon width calculation for proper DPI scaling
May 29, 2026
608216e
Handle feedback
Jun 15, 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
21 changes: 16 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 @@ -17,6 +17,7 @@ private class CursorUI : ListBox
private IWindowsFormsEditorService? _editorService;
private readonly TypeConverter _cursorConverter;
private readonly Dictionary<(Cursor cursor, int dpi), int> _cursorWidthCache = new();
private int _cursorWidth;

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

_cursorWidth = GetCursorWidthForDpi(Cursors.Default, DeviceDpi);
}

public object? Value { get; private set; }
Expand Down Expand Up @@ -67,14 +70,13 @@ protected override void OnDrawItem(DrawItemEventArgs e)
string? text = _cursorConverter.ConvertToString(cursor);
Font font = e.Font!;
using var brushText = e.ForeColor.GetCachedSolidBrushScope();
int cursorWidth = GetCursorWidthForDpi(cursor, DeviceDpi);

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 Expand Up @@ -124,5 +126,14 @@ public void Start(IWindowsFormsEditorService editorService, object? value)
}
}
}

protected override void RescaleConstantsForDpi(int deviceDpiOld, int deviceDpiNew)
{
base.RescaleConstantsForDpi(deviceDpiOld, deviceDpiNew);

// Recalculate the representative width using the new DPI; all rows continue to share it to avoid the layout issues seen in #14167.
_cursorWidth = GetCursorWidthForDpi(Cursors.Default, deviceDpiNew);
Invalidate();
}
}
}
Loading