From e98de937b28d42493de5dea6365c853d6b412d3c Mon Sep 17 00:00:00 2001
From: chenn <gu.beic@qq.com>
Date: 星期五, 11 四月 2025 17:06:10 +0800
Subject: [PATCH] 解决冲突
---
WinFrmUI/DPumpHydr.WinFrmUI.Ribbon/Component Classes/Ribbon.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/DPumpHydr.WinFrmUI.Ribbon/Component Classes/Ribbon.cs b/WinFrmUI/DPumpHydr.WinFrmUI.Ribbon/Component Classes/Ribbon.cs
index 94c903d..2c1c233 100644
--- a/WinFrmUI/DPumpHydr.WinFrmUI.Ribbon/Component Classes/Ribbon.cs
+++ b/WinFrmUI/DPumpHydr.WinFrmUI.Ribbon/Component Classes/Ribbon.cs
@@ -728,7 +728,9 @@
public Theme Theme => _theme == null ? Theme.Standard : _theme;
/// <summary>
- /// Gets or sets the Style of the orb
+ /// Gets or sets the Style of the orb.
+ ///
+ /// This is where the default values are loaded when changing the OrbStyle.
/// </summary>
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
[Category("Orb")]
@@ -764,6 +766,7 @@
ItemMargin = new Padding(4, 2, 4, 2);
ItemPadding = new Padding(1, 0, 1, 0);
ItemImageToTextSpacing = 4;
+ this.OrbDropDown.BorderRoundness = 8;
}
else if ((value == RibbonOrbStyle.Office_2010) ||
(value == RibbonOrbStyle.Office_2010_Extended))
@@ -789,6 +792,7 @@
ItemMargin = new Padding(3, 2, 0, 2);
ItemPadding = new Padding(1, 0, 1, 0);
ItemImageToTextSpacing = 11;
+ this.OrbDropDown.BorderRoundness = 2;
}
else if (value == RibbonOrbStyle.Office_2013)
{
@@ -813,6 +817,7 @@
ItemMargin = new Padding(2, 2, 0, 2);
ItemPadding = new Padding(1, 0, 1, 0);
ItemImageToTextSpacing = 11;
+ this.OrbDropDown.BorderRoundness = 2;
}
UpdateRegions();
Invalidate();
@@ -2147,7 +2152,7 @@
caption = Rectangle.FromLTRB(0, 0, captionRight, CaptionBarSize);
}
- Point screenPoint = new Point(WinApi.LoWord((int)m.LParam), WinApi.HiWord((int)m.LParam));
+ Point screenPoint = new Point(WinApi.Get_X_LParam(m.LParam), WinApi.Get_Y_LParam(m.LParam));
Point ribbonPoint = PointToClient(screenPoint);
bool onCaptionButtons = false;
--
Gitblit v1.9.3