Skip to content

Commit d495460

Browse files
committed
Add judgement "IsHandleCreated" in OwnerDraw
1 parent 8818780 commit d495460

File tree

1 file changed

+2
-1
lines changed
  • src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons

1 file changed

+2
-1
lines changed

src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/Button.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,13 @@ private protected override bool OwnerDraw
161161
get
162162
{
163163
if (Application.IsDarkModeEnabled
164-
165164
// The SystemRenderer cannot render images. So, we flip to our
166165
// own DarkMode renderer, if we need to render images, except if...
167166
&& Image is null
168167
// ...or a BackgroundImage, except if...
169168
&& BackgroundImage is null
169+
// Delay BackgroundImage check until handle is created to avoid early null misjudgment
170+
&& IsHandleCreated
170171
// ...the user wants to opt out of implicit DarkMode rendering.
171172
&& DarkModeRequestState is true
172173

0 commit comments

Comments
 (0)