Skip to content

Commit 2153282

Browse files
Update ToolStripManager.
1 parent 1c2c8c5 commit 2153282

File tree

2 files changed

+7
-23
lines changed

2 files changed

+7
-23
lines changed

src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStripManager.cs

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -546,24 +546,12 @@ public static bool VisualStylesEnabled
546546

547547
internal static ToolStripRenderer CreateRenderer(ToolStripManagerRenderMode renderMode)
548548
{
549-
switch (renderMode)
549+
return renderMode switch
550550
{
551-
case ToolStripManagerRenderMode.System:
552-
return new ToolStripSystemRenderer(isDefault: true);
553-
case ToolStripManagerRenderMode.Professional:
554-
#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.
555-
if (Application.IsDarkModeEnabled)
556-
{
557-
return new ToolStripProfessionalRenderer(new DarkProfessionalColors());
558-
}
559-
#pragma warning restore WFO5001
560-
561-
return new ToolStripProfessionalRenderer(isDefault: true);
562-
563-
case ToolStripManagerRenderMode.Custom:
564-
default:
565-
return new ToolStripSystemRenderer(isDefault: true);
566-
}
551+
ToolStripManagerRenderMode.System => new ToolStripSystemRenderer(isDefault: true),
552+
ToolStripManagerRenderMode.Professional => new ToolStripProfessionalRenderer(isDefault: true),
553+
_ => new ToolStripSystemRenderer(isDefault: true),
554+
};
567555
}
568556

569557
internal static ToolStripRenderer CreateRenderer(ToolStripRenderMode renderMode)

src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStripSystemRenderer.cs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -697,8 +697,7 @@ private static void RenderItemInternal(ToolStripItemRenderEventArgs e)
697697
ToolBarState state = GetToolBarState(item);
698698
VisualStyleElement toolBarElement = VisualStyleElement.ToolBar.Button.Normal;
699699

700-
#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.
701-
if (ToolStripManager.VisualStylesEnabled && !Application.IsDarkModeEnabled
700+
if (ToolStripManager.VisualStylesEnabled
702701
&& VisualStyleRenderer.IsElementDefined(toolBarElement))
703702
{
704703
VisualStyleRenderer vsRenderer = VisualStyleRenderer!;
@@ -717,7 +716,6 @@ private static void RenderItemInternal(ToolStripItemRenderEventArgs e)
717716
{
718717
RenderSmall3DBorderInternal(g, new Rectangle(Point.Empty, item.Size), state, (item.RightToLeft == RightToLeft.Yes));
719718
}
720-
#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.
721719

722720
Rectangle fillRect = item.ContentRectangle;
723721

@@ -818,10 +816,9 @@ private static void RenderStatusStripBorder(ToolStripRenderEventArgs e)
818816
}
819817
}
820818

821-
#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.
822819
private static void RenderStatusStripBackground(ToolStripRenderEventArgs e)
823820
{
824-
if (!Application.IsDarkModeEnabled && Application.RenderWithVisualStyles)
821+
if (Application.RenderWithVisualStyles)
825822
{
826823
VisualStyleRenderer vsRenderer = VisualStyleRenderer!;
827824
vsRenderer.SetParameters(VisualStyleElement.Status.Bar.Normal);
@@ -835,7 +832,6 @@ private static void RenderStatusStripBackground(ToolStripRenderEventArgs e)
835832
}
836833
}
837834
}
838-
#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.
839835

840836
private static void RenderLabelInternal(ToolStripItemRenderEventArgs e)
841837
{

0 commit comments

Comments
 (0)