diff --git a/SunnyUI.Demo/Controls/FButton.resx b/SunnyUI.Demo/Controls/FButton.resx
index 3ea6cbca..eaa39c0c 100644
--- a/SunnyUI.Demo/Controls/FButton.resx
+++ b/SunnyUI.Demo/Controls/FButton.resx
@@ -120,6 +120,9 @@
17, 17
+
+ 17, 17
+
52
diff --git a/SunnyUI/Controls/UIButton.cs b/SunnyUI/Controls/UIButton.cs
index 9c2049b0..bdc66394 100644
--- a/SunnyUI/Controls/UIButton.cs
+++ b/SunnyUI/Controls/UIButton.cs
@@ -77,27 +77,6 @@ namespace Sunny.UI
base.OnClick(e);
}
- private bool useDoubleClick = false;
-
- [Description("是否启用双击事件"), Category("SunnyUI")]
- [DefaultValue(false)]
- public bool UseDoubleClick
- {
- get
- {
- return useDoubleClick;
- }
- set
- {
- if (useDoubleClick != value)
- {
- useDoubleClick = value;
- SetStyle(ControlStyles.StandardDoubleClick, useDoubleClick);
- Invalidate();
- }
- }
- }
-
private bool showTips = false;
[Description("是否显示角标"), Category("SunnyUI")]
diff --git a/SunnyUI/Controls/UICheckBox.cs b/SunnyUI/Controls/UICheckBox.cs
index e51d07ac..1645d260 100644
--- a/SunnyUI/Controls/UICheckBox.cs
+++ b/SunnyUI/Controls/UICheckBox.cs
@@ -105,27 +105,6 @@ namespace Sunny.UI
}
}
- private bool _useDoubleClick = false;
-
- [Description("是否启用双击事件"), Category("SunnyUI")]
- [DefaultValue(false)]
- public bool UseDoubleClick
- {
- get
- {
- return _useDoubleClick;
- }
- set
- {
- if (_useDoubleClick != value)
- {
- _useDoubleClick = value;
- SetStyle(ControlStyles.StandardDoubleClick, _useDoubleClick);
- Invalidate();
- }
- }
- }
-
protected override void OnPaintFore(Graphics g, GraphicsPath path)
{
//设置按钮标题位置
diff --git a/SunnyUI/Controls/UIControl.cs b/SunnyUI/Controls/UIControl.cs
index ded48a83..674948a7 100644
--- a/SunnyUI/Controls/UIControl.cs
+++ b/SunnyUI/Controls/UIControl.cs
@@ -266,6 +266,27 @@ namespace Sunny.UI
}
}
+ private bool useDoubleClick = false;
+
+ [Description("是否启用双击事件"), Category("SunnyUI")]
+ [DefaultValue(false)]
+ public bool UseDoubleClick
+ {
+ get
+ {
+ return useDoubleClick;
+ }
+ set
+ {
+ if (useDoubleClick != value)
+ {
+ useDoubleClick = value;
+ //SetStyle(ControlStyles.StandardDoubleClick, useDoubleClick);
+ //Invalidate();
+ }
+ }
+ }
+
///
/// OnPaint
///
diff --git a/SunnyUI/Controls/UISwitch.cs b/SunnyUI/Controls/UISwitch.cs
index 26eecda2..e667f3d5 100644
--- a/SunnyUI/Controls/UISwitch.cs
+++ b/SunnyUI/Controls/UISwitch.cs
@@ -137,26 +137,6 @@ namespace Sunny.UI
set => SetRectColor(value);
}
- private bool useDoubleClick = false;
-
- [Description("是否启用双击事件"), Category("SunnyUI")]
- [DefaultValue(false)]
- public bool UseDoubleClick
- {
- get
- {
- return useDoubleClick;
- }
- set
- {
- if (useDoubleClick != value)
- {
- useDoubleClick = value;
- Invalidate();
- }
- }
- }
-
protected override void OnClick(EventArgs e)
{
base.OnClick(e);
@@ -165,7 +145,7 @@ namespace Sunny.UI
protected override void OnDoubleClick(EventArgs e)
{
- if (!useDoubleClick)
+ if (!UseDoubleClick)
{
base.OnClick(e);
Active = !Active;