Skip to content

Fix ToolStripStatusLabel text visibility in High Contrast mode with System RenderMode #14110

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 1 commit into
base: main
Choose a base branch
from
Open

Fix ToolStripStatusLabel text visibility in High Contrast mode with System RenderMode #14110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStripLabel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ internal void PaintText(Graphics g)
{
Font font = Font;
Color textColor = ForeColor;
Rectangle textRect = InternalLayout.TextRectangle;
if (IsLink)
{
LinkUtilities.EnsureLinkFonts(font, LinkBehavior, ref _linkFont, ref _hoverLinkFont);
Expand All @@ -359,11 +360,19 @@ internal void PaintText(Graphics g)
{
font = _hoverLinkFont;
textColor = ActiveLinkColor;
if (DisplayInformation.HighContrast)
{
g.FillRectangle(SystemBrushes.Highlight, textRect);
}
}
else if (Selected)
{
font = _hoverLinkFont;
textColor = (LinkVisited) ? VisitedLinkColor : LinkColor;
if (DisplayInformation.HighContrast)
{
g.FillRectangle(SystemBrushes.Highlight, textRect);
}
}
else
{
Expand All @@ -372,7 +381,6 @@ internal void PaintText(Graphics g)
}
}

Rectangle textRect = InternalLayout.TextRectangle;
renderer.DrawItemText(new ToolStripItemTextRenderEventArgs(g, this, Text, textRect, textColor, font, InternalLayout.TextFormat));
}
}
Expand Down
Loading