zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* UITextBox: 修改右侧Button可能不显示的问题

Browse Source
This commit is contained in:
Sunny 2022-09-16 22:19:21 +08:00
parent 1612c975d3
commit 797b565009
7 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SunnyUI/Controls/DropItem/UIDropControl.cs
View File

@ -74,7 +74,7 @@ namespace Sunny.UI
protected override void OnContextMenuStripChanged(EventArgs e) protected override void OnContextMenuStripChanged(EventArgs e)
{ {
base.OnContextMenuStripChanged(e); base.OnContextMenuStripChanged(e);
edit.ContextMenuStrip = ContextMenuStrip; if (edit != null) edit.ContextMenuStrip = ContextMenuStrip;
} }
[Browsable(false)] [Browsable(false)]

6
SunnyUI/Controls/UIFlowLayoutPanel.cs
View File

@ -64,6 +64,12 @@ namespace Sunny.UI
timer.Start(); timer.Start();
} }
protected override void OnContextMenuStripChanged(EventArgs e)
{
base.OnContextMenuStripChanged(e);
if (Panel != null) Panel.ContextMenuStrip = ContextMenuStrip;
}
/// <summary> /// <summary>
/// 重载字体变更 /// 重载字体变更
/// </summary> /// </summary>

6
SunnyUI/Controls/UIImageListBox.cs
View File

@ -88,6 +88,12 @@ namespace Sunny.UI
public new event MouseEventHandler MouseDoubleClick; public new event MouseEventHandler MouseDoubleClick;
protected override void OnContextMenuStripChanged(EventArgs e)
{
base.OnContextMenuStripChanged(e);
if (listbox != null) listbox.ContextMenuStrip = ContextMenuStrip;
}
private void Listbox_MouseDoubleClick(object sender, MouseEventArgs e) private void Listbox_MouseDoubleClick(object sender, MouseEventArgs e)
{ {
MouseDoubleClick?.Invoke(this, e); MouseDoubleClick?.Invoke(this, e);

2
SunnyUI/Controls/UIListBox.cs
View File

@ -343,7 +343,7 @@ namespace Sunny.UI
protected override void OnContextMenuStripChanged(EventArgs e) protected override void OnContextMenuStripChanged(EventArgs e)
{ {
base.OnContextMenuStripChanged(e); base.OnContextMenuStripChanged(e);
listbox.ContextMenuStrip = ContextMenuStrip; if (listbox != null) listbox.ContextMenuStrip = ContextMenuStrip;
} }
private void Listbox_MouseMove(object sender, MouseEventArgs e) private void Listbox_MouseMove(object sender, MouseEventArgs e)

2
SunnyUI/Controls/UIRichTextBox.cs
View File

@ -184,7 +184,7 @@ namespace Sunny.UI
protected override void OnContextMenuStripChanged(EventArgs e) protected override void OnContextMenuStripChanged(EventArgs e)
{ {
base.OnContextMenuStripChanged(e); base.OnContextMenuStripChanged(e);
edit.ContextMenuStrip = ContextMenuStrip; if (edit != null) edit.ContextMenuStrip = ContextMenuStrip;
} }
/// <summary> /// <summary>

19
SunnyUI/Controls/UITextBox.cs
View File

@ -39,6 +39,7 @@
* 2022-07-28: V3.2.2 修复了有水印文字时，不响应Click和DoubleClick事件的问题 * 2022-07-28: V3.2.2 修复了有水印文字时，不响应Click和DoubleClick事件的问题
* 2022-09-05: V3.2.3 修复了无水印文字时，光标有时不显示的问题 * 2022-09-05: V3.2.3 修复了无水印文字时，光标有时不显示的问题
* 2022-09-16: V3.2.4 支持自定义右键菜单 * 2022-09-16: V3.2.4 支持自定义右键菜单
* 2022-09-16: V3.2.4 修改右侧Button可能不显示的问题
******************************************************************************/ ******************************************************************************/
using System; using System;
@ -142,7 +143,7 @@ namespace Sunny.UI
protected override void OnContextMenuStripChanged(EventArgs e) protected override void OnContextMenuStripChanged(EventArgs e)
{ {
base.OnContextMenuStripChanged(e); base.OnContextMenuStripChanged(e);
edit.ContextMenuStrip = ContextMenuStrip; if (edit != null) edit.ContextMenuStrip = ContextMenuStrip;
} }
/// <summary> /// <summary>
@ -209,21 +210,15 @@ namespace Sunny.UI
[DefaultValue(29), Category("SunnyUI"), Description("按钮宽度")] [DefaultValue(29), Category("SunnyUI"), Description("按钮宽度")]
public int ButtonWidth { get => btn.Width; set { btn.Width = Math.Max(20, value); SizeChange(); } } public int ButtonWidth { get => btn.Width; set { btn.Width = Math.Max(20, value); SizeChange(); } }
private bool showButton = false;
[DefaultValue(false), Category("SunnyUI"), Description("显示按钮")] [DefaultValue(false), Category("SunnyUI"), Description("显示按钮")]
public bool ShowButton public bool ShowButton
{ {
get => btn.Visible; get => showButton;
set set
{ {
if (Multiline) showButton = !multiline && value;
{ if (btn.IsValid()) btn.Visible = showButton;
btn.Visible = false;
}
else
{
btn.Visible = value;
}
SizeChange(); SizeChange();
} }
} }
@ -407,7 +402,7 @@ namespace Sunny.UI
} }
} }
private bool multiline; private bool multiline = false;
[DefaultValue(false)] [DefaultValue(false)]
public bool Multiline public bool Multiline

6
SunnyUI/Controls/UITreeView.cs
View File

@ -86,6 +86,12 @@ namespace Sunny.UI
view.AfterLabelEdit += View_AfterLabelEdit; view.AfterLabelEdit += View_AfterLabelEdit;
} }
protected override void OnContextMenuStripChanged(EventArgs e)
{
base.OnContextMenuStripChanged(e);
if (view != null) view.ContextMenuStrip = ContextMenuStrip;
}
public int DrawLeft(TreeNode node) public int DrawLeft(TreeNode node)
{ {
if (view == null || node == null) return 0; if (view == null || node == null) return 0;