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

button 空格键按下press背景效果

Browse Source 
imagelistbox 滚动条bug
分页控件 当前页为首页或者最后页时，上一页或者下一页按钮enable设置为false
This commit is contained in:
H 2020-08-22 18:31:20 +08:00
parent a4acdf6a50
commit 609488137c
5 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
SunnyUI.Demo/Controls/FDataGridView.Designer.cs generated
View File

@ -80,7 +80,6 @@
this.uiDataGridView1.Location = new System.Drawing.Point(0, 0);
this.uiDataGridView1.MultiSelect = false;
this.uiDataGridView1.Name = "uiDataGridView1";
this.uiDataGridView1.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255)))));
this.uiDataGridView1.RowHeadersVisible = false;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.White;
this.uiDataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle4;
@ -90,11 +89,10 @@
this.uiDataGridView1.ShowRect = false;
this.uiDataGridView1.Size = new System.Drawing.Size(861, 380);
this.uiDataGridView1.TabIndex = 0;
this.uiDataGridView1.TagString = null;
//
// uiPagination1
//
this.uiPagination1.ActivePage = 500;
this.uiPagination1.ActivePage = 50;
this.uiPagination1.CausesValidation = false;
this.uiPagination1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.uiPagination1.Font = new System.Drawing.Font("微软雅黑", 12F);
@ -102,6 +100,7 @@
this.uiPagination1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPagination1.Name = "uiPagination1";
this.uiPagination1.PagerCount = 11;
this.uiPagination1.PageSize = 50;
this.uiPagination1.RectSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.None;
this.uiPagination1.Size = new System.Drawing.Size(861, 35);
this.uiPagination1.TabIndex = 1;

10
SunnyUI/Controls/UIButton.cs
View File

@ -382,12 +382,22 @@ namespace Sunny.UI
{
if (Focused && e.KeyCode == Keys.Space)
{
IsPress = true;
Invalidate();
PerformClick();
}
base.OnKeyDown(e);
}
protected override void OnKeyUp(KeyEventArgs e)
{
IsPress = false;
Invalidate();
base.OnKeyUp(e);
}
[DefaultValue(false)]
[Description("显示激活时边框线"), Category("SunnyUI")]
public bool ShowFocusLine { get; set; }

24
SunnyUI/Controls/UIImageListBox.cs
View File

@ -321,7 +321,14 @@ namespace Sunny.UI
protected override void OnSizeChanged(EventArgs e)
{
SetScrollInfo();
if (Bar != null && Bar.Visible)
{
if (Bar.Value != 0)
{
ScrollBarInfo.SetScrollValue(Handle, Bar.Value);
}
}
//SetScrollInfo();
}
public void SetScrollInfo()
@ -379,22 +386,19 @@ namespace Sunny.UI
{
base.OnMouseWheel(e);
if (Bar.Visible)
if (Bar != null && Bar.Visible)
{
var si = ScrollBarInfo.GetInfo(Handle);
int temp = Math.Abs(e.Delta / 120);
if (e.Delta > 10)
{
if (si.nPos > 0)
{
ScrollBarInfo.ScrollUp(Handle);
}
int nposnum = si.nPos - temp * SystemInformation.MouseWheelScrollLines;
ScrollBarInfo.SetScrollValue(Handle, nposnum >= si.nMin ? nposnum : 0);
}
else if (e.Delta < -10)
{
if (si.nPos < si.ScrollMax)
{
ScrollBarInfo.ScrollDown(Handle);
}
int nposnum = si.nPos + temp * SystemInformation.MouseWheelScrollLines;
ScrollBarInfo.SetScrollValue(Handle, nposnum <= si.nMax ? nposnum : si.nMax);
}
}

5
SunnyUI/Controls/UIListBox.cs
View File

@ -404,12 +404,11 @@ namespace Sunny.UI
else if (e.Delta < -10)
{
int nposnum = si.nPos + temp * SystemInformation.MouseWheelScrollLines;
ScrollBarInfo.SetScrollValue(Handle, nposnum <= si.nMax ? nposnum : si.nMax);
ScrollBarInfo.SetScrollValue(Handle, nposnum <= si.ScrollMax ? nposnum : si.ScrollMax);
}
}
SetScrollInfo();
}
}
public void SetStyle(UIStyle style)
{

20
SunnyUI/Controls/UIPagination.cs
View File

@ -703,8 +703,24 @@ namespace Sunny.UI
edtPage.HasMaximum = true;
edtPage.Maximum = PageCount;
if (activePage > PageCount) activePage = PageCount;
if (activePage < 1) activePage = 1;
if (activePage >= PageCount)
{
activePage = PageCount;
b16.Enabled = false;
}
else
{
b16.Enabled = true;
}
if (activePage <= 1)
{
activePage = 1;
b0.Enabled = false;
}
else
{
b0.Enabled = true;
}
edtPage.IntValue = activePage;
if (TotalCount == 0)