解决冲突

chenn

2025-04-11 e98de937b28d42493de5dea6365c853d6b412d3c

 WinFrmUI/DPumpHydr.WinFrmUI.Ribbon/Component Classes/RibbonUpDown.cs

@@ -226,7 +226,7 @@

            if (UpButtonBounds.Contains(e.Location))
            {
                Owner.Cursor = Cursors.Default;
                Canvas.Cursor = Cursors.Default;
                mustRedraw = !UpButtonSelected || DownButtonSelected || DownButtonPressed;
                UpButtonSelected = true;
                DownButtonSelected = false;
@@ -234,7 +234,7 @@
            }
            else if (DownButtonBounds.Contains(e.Location))
            {
                Owner.Cursor = Cursors.Default;
                Canvas.Cursor = Cursors.Default;
                mustRedraw = !DownButtonSelected || UpButtonSelected || UpButtonPressed;
                DownButtonSelected = true;
                UpButtonSelected = false;
@@ -242,7 +242,7 @@
            }
            else if (TextBoxBounds.Contains(e.X, e.Y))
            {
                Owner.Cursor = Cursors.IBeam;
                Canvas.Cursor = Cursors.IBeam;
                mustRedraw = DownButtonSelected || DownButtonPressed || UpButtonSelected || UpButtonPressed;
                UpButtonSelected = false;
                UpButtonPressed = false;
@@ -251,7 +251,7 @@
            }
            else
            {
                Owner.Cursor = Cursors.Default;
                Canvas.Cursor = Cursors.Default;
            }

            if (mustRedraw)