Distinguishing between pressed and hover states

Leaf Shi · Leaf Shi · commit e879dd02593d · 2025-09-22T23:57:16.000-07:00
diff --git a/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/PopupButtonDarkModeRenderer.cs b/src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/DarkMode/PopupButtonDarkModeRenderer.cs
@@ -141,10 +141,10 @@ private static void DrawButtonBorder(Graphics graphics, Rectangle bounds, PushBu
 
             if (state == PushButtonState.Pressed)
             {
-                // In pressed state, invert the 3D effect: highlight bottom/right, shadow top/left
-                topLeftOuter = DefaultColors.HighlightColor;       // shadow
-                bottomRightOuter = DefaultColors.HighlightColor; // highlight
-                topLeftInner = DefaultColors.HighlightBrightColor;   // deeper shadow
+                // In pressed state, invert the 3D effect: brighter highlight bottom/right, deeper shadow top/left
+                topLeftOuter = DefaultColors.ShadowDarkColor;       // deeper shadow
+                bottomRightOuter = DefaultColors.HighlightBrightColor; // brighter highlight
+                topLeftInner = DefaultColors.ShadowDarkColor;   // deeper shadow
                 bottomRightInner = DefaultColors.HighlightBrightColor; // brighter highlight
             }
             else if (state == PushButtonState.Disabled)
@@ -160,8 +160,8 @@ private static void DrawButtonBorder(Graphics graphics, Rectangle bounds, PushBu
                 // In pressed/hot state, invert the 3D effect: highlight bottom/right, shadow top/left
                 topLeftOuter = DefaultColors.ShadowColor;       // shadow
                 bottomRightOuter = DefaultColors.HighlightColor; // highlight
-                topLeftInner = DefaultColors.ShadowDarkColor;   // deeper shadow
-                bottomRightInner = DefaultColors.HighlightBrightColor; // brighter highlight
+                topLeftInner = DefaultColors.ShadowColor;   // shadow
+                bottomRightInner = DefaultColors.HighlightColor; // highlight
             }
             else
             {

Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,10 @@ private static void DrawButtonBorder(Graphics graphics, Rectangle bounds, PushBu`
`141`	`141`
`142`	`142`	`if (state == PushButtonState.Pressed)`
`143`	`143`	`{`
`144`		`- // In pressed state, invert the 3D effect: highlight bottom/right, shadow top/left`
`145`		`- topLeftOuter = DefaultColors.HighlightColor; // shadow`
`146`		`- bottomRightOuter = DefaultColors.HighlightColor; // highlight`
`147`		`- topLeftInner = DefaultColors.HighlightBrightColor; // deeper shadow`
	`144`	`+ // In pressed state, invert the 3D effect: brighter highlight bottom/right, deeper shadow top/left`
	`145`	`+ topLeftOuter = DefaultColors.ShadowDarkColor; // deeper shadow`
	`146`	`+ bottomRightOuter = DefaultColors.HighlightBrightColor; // brighter highlight`
	`147`	`+ topLeftInner = DefaultColors.ShadowDarkColor; // deeper shadow`
`148`	`148`	`bottomRightInner = DefaultColors.HighlightBrightColor; // brighter highlight`
`149`	`149`	`}`
`150`	`150`	`else if (state == PushButtonState.Disabled)`
`@@ -160,8 +160,8 @@ private static void DrawButtonBorder(Graphics graphics, Rectangle bounds, PushBu`
`160`	`160`	`// In pressed/hot state, invert the 3D effect: highlight bottom/right, shadow top/left`
`161`	`161`	`topLeftOuter = DefaultColors.ShadowColor; // shadow`
`162`	`162`	`bottomRightOuter = DefaultColors.HighlightColor; // highlight`
`163`		`- topLeftInner = DefaultColors.ShadowDarkColor; // deeper shadow`
`164`		`- bottomRightInner = DefaultColors.HighlightBrightColor; // brighter highlight`
	`163`	`+ topLeftInner = DefaultColors.ShadowColor; // shadow`
	`164`	`+ bottomRightInner = DefaultColors.HighlightColor; // highlight`
`165`	`165`	`}`
`166`	`166`	`else`
`167`	`167`	`{`