Skip to content

Commit ed08174

Browse files
authored
fix #13777 : Dark Mode: Divider line between Up and Down buttons is not visible in DomainUpDown/NumericUpDown when mouse-over or click them (#13795)
* fix #13777 : Dark Mode: Divider line between Up and Down buttons is not visible in DomainUpDown/NumericUpDown when mouse-over or click them * add border
1 parent 0698c1a commit ed08174

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

src/System.Windows.Forms/System/Windows/Forms/Controls/UpDown/UpDownBase.UpDownButtons.cs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Drawing;
55
using System.Drawing.Imaging;
66
using System.Windows.Forms.VisualStyles;
7+
using static System.Windows.Forms.ControlPaint;
78

89
namespace System.Windows.Forms;
910

@@ -275,21 +276,25 @@ protected override void OnPaint(PaintEventArgs e)
275276
_parent._defaultButtonsWidth,
276277
ClientSize.Height);
277278

278-
ControlPaint.DrawScrollButton(
279+
DrawModernControlButton(
279280
cachedGraphics,
280281
new Rectangle(0, 0, _parent._defaultButtonsWidth, half_height),
281-
ScrollButton.Up,
282+
ModernControlButtonStyle.Up | ModernControlButtonStyle.SingleBorder,
282283
_pushed == ButtonID.Up
283-
? ButtonState.Pushed
284-
: (Enabled ? ButtonState.Normal : ButtonState.Inactive));
284+
? ModernControlButtonState.Pressed
285+
: (Enabled ? (_mouseOver == ButtonID.Up ? ModernControlButtonState.Hover : ModernControlButtonState.Normal)
286+
: ModernControlButtonState.Disabled),
287+
true);
285288

286-
ControlPaint.DrawScrollButton(
289+
DrawModernControlButton(
287290
cachedGraphics,
288291
new Rectangle(0, half_height, _parent._defaultButtonsWidth, half_height),
289-
ScrollButton.Down,
292+
ModernControlButtonStyle.Down | ModernControlButtonStyle.SingleBorder,
290293
_pushed == ButtonID.Down
291-
? ButtonState.Pushed
292-
: (Enabled ? ButtonState.Normal : ButtonState.Inactive));
294+
? ModernControlButtonState.Pressed
295+
: (Enabled ? (_mouseOver == ButtonID.Down ? ModernControlButtonState.Hover : ModernControlButtonState.Normal)
296+
: ModernControlButtonState.Disabled),
297+
true);
293298

294299
e.GraphicsInternal.DrawImageUnscaled(
295300
_cachedBitmap,

0 commit comments

Comments
 (0)