Skip to content

[DarkMode] Fix MDIParent MainMenuStrip System Bitmaps #13480

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

[DarkMode] Fix MDIParent MainMenuStrip System Bitmaps #13480

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
31 changes: 30 additions & 1 deletion src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStripMenuItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.ComponentModel;
using System.ComponentModel.Design.Serialization;
using System.Drawing;
using System.Drawing.Imaging;
using System.Globalization;
using System.Runtime.InteropServices;
using System.Windows.Forms.Design;
Expand Down Expand Up @@ -712,7 +713,35 @@ private unsafe bool GetNativeMenuItemEnabled()
g.DrawRectangle(SystemPens.Control, 0, 0, image.Width - 1, image.Height - 1);
}

image.MakeTransparent(SystemColors.Control);
#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
image.MakeTransparent(Application.IsDarkModeEnabled
? ColorTranslator.FromWin32((int)PInvokeCore.GetSysColor(SYS_COLOR_INDEX.COLOR_BTNFACE))
: SystemColors.Control);
if (Application.IsDarkModeEnabled)
{
Bitmap bmpDest = new Bitmap(image.Width, image.Height);
ColorMatrix clrMatrix = new ColorMatrix
([
[-1, 0, 0, 0, 0],
[0, -1, 0, 0, 0],
[0, 0, -1, 0, 0],
[0, 0, 0, 1, 0],
[1, 1, 1, 0, 1]
]);

using (ImageAttributes attrImage = new ImageAttributes())
{
attrImage.SetColorMatrix(clrMatrix);
using Graphics g = Graphics.FromImage(bmpDest);
g.DrawImage(image, new Rectangle(0, 0,
image.Width, image.Height), 0, 0,
image.Width, image.Height, GraphicsUnit.Pixel,
attrImage);
}

return bmpDest;
}
#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
return image;
}

Expand Down