diff --git a/SunnyUI/Controls/UIFlowLayoutPanel.cs b/SunnyUI/Controls/UIFlowLayoutPanel.cs index 616e275c..8723db10 100644 --- a/SunnyUI/Controls/UIFlowLayoutPanel.cs +++ b/SunnyUI/Controls/UIFlowLayoutPanel.cs @@ -26,6 +26,8 @@ * 2022-11-13: V3.2.8 增加滚动条背景色调整 * 2022-11-13: V3.2.8 删除AddControl、RemoveControl方法 * 2022-11-25: V3.2.9 增加Get方法以获取控件 + * 2023-01-11: V3.3.1 增加AutoScroll属性 + * 2023-01-11: V3.3.1 修复只显示水平滚动条时,鼠标滚轮滚动水平滚动条不动的问题 ******************************************************************************/ using System; @@ -69,6 +71,14 @@ namespace Sunny.UI timer.Start(); } + [DefaultValue(true)] + [Browsable(true)] + public new bool AutoScroll + { + get => Panel.AutoScroll; + set => Panel.AutoScroll = value; + } + private int scrollBarWidth = 0; [DefaultValue(0), Category("SunnyUI"), Description("垂直滚动条宽度,最小为原生滚动条宽度")] @@ -414,22 +424,23 @@ namespace Sunny.UI private void Panel_MouseWheel(object sender, MouseEventArgs e) { - if (e.Delta < 0) - { - if (Panel.VerticalScroll.Maximum > Panel.VerticalScroll.Value + 50) - Panel.VerticalScroll.Value += 50; - else - Panel.VerticalScroll.Value = Panel.VerticalScroll.Maximum; - } - else - { - if (Panel.VerticalScroll.Value > 50) - Panel.VerticalScroll.Value -= 50; - else - Panel.VerticalScroll.Value = 0; - } + //if (e.Delta < 0) + //{ + // if (Panel.VerticalScroll.Maximum > Panel.VerticalScroll.Value + 50) + // Panel.VerticalScroll.Value += 50; + // else + // Panel.VerticalScroll.Value = Panel.VerticalScroll.Maximum; + //} + //else + //{ + // if (Panel.VerticalScroll.Value > 50) + // Panel.VerticalScroll.Value -= 50; + // else + // Panel.VerticalScroll.Value = 0; + //} VBar.Value = Panel.VerticalScroll.Value; + HBar.Value = Panel.HorizontalScroll.Value; } private void VBar_ValueChanged(object sender, EventArgs e)