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

* UIPagination：更改无数据源时分页页码为1

Browse Source 
* UITitlePanel：Dock时缩放问题
This commit is contained in:
Sunny 2020-11-28 23:56:00 +08:00
parent 1b74653a2f
commit b6273b8985
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
Bin/SunnyUI.dll
View File

Binary file not shown.

4
SunnyUI.Demo/Controls/FPanel.Designer.cs generated
View File

@ -49,6 +49,7 @@
this.uiTitlePanel1.ForeColor = System.Drawing.Color.White; this.uiTitlePanel1.ForeColor = System.Drawing.Color.White;
this.uiTitlePanel1.Location = new System.Drawing.Point(30, 230); this.uiTitlePanel1.Location = new System.Drawing.Point(30, 230);
this.uiTitlePanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiTitlePanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiTitlePanel1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiTitlePanel1.Name = "uiTitlePanel1"; this.uiTitlePanel1.Name = "uiTitlePanel1";
this.uiTitlePanel1.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0); this.uiTitlePanel1.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
this.uiTitlePanel1.Size = new System.Drawing.Size(270, 180); this.uiTitlePanel1.Size = new System.Drawing.Size(270, 180);
@ -60,6 +61,7 @@
this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiPanel1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiPanel1.Location = new System.Drawing.Point(30, 20); this.uiPanel1.Location = new System.Drawing.Point(30, 20);
this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiPanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiPanel1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiPanel1.Name = "uiPanel1"; this.uiPanel1.Name = "uiPanel1";
this.uiPanel1.Size = new System.Drawing.Size(270, 180); this.uiPanel1.Size = new System.Drawing.Size(270, 180);
this.uiPanel1.TabIndex = 3; this.uiPanel1.TabIndex = 3;
@ -70,6 +72,7 @@
this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiGroupBox1.Font = new System.Drawing.Font("微软雅黑", 12F);
this.uiGroupBox1.Location = new System.Drawing.Point(331, 4); this.uiGroupBox1.Location = new System.Drawing.Point(331, 4);
this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiGroupBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiGroupBox1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiGroupBox1.Name = "uiGroupBox1"; this.uiGroupBox1.Name = "uiGroupBox1";
this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0); this.uiGroupBox1.Padding = new System.Windows.Forms.Padding(0, 32, 0, 0);
this.uiGroupBox1.Size = new System.Drawing.Size(270, 196); this.uiGroupBox1.Size = new System.Drawing.Size(270, 196);
@ -82,6 +85,7 @@
this.uiTitlePanel2.ForeColor = System.Drawing.Color.White; this.uiTitlePanel2.ForeColor = System.Drawing.Color.White;
this.uiTitlePanel2.Location = new System.Drawing.Point(331, 230); this.uiTitlePanel2.Location = new System.Drawing.Point(331, 230);
this.uiTitlePanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.uiTitlePanel2.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uiTitlePanel2.MinimumSize = new System.Drawing.Size(1, 1);
this.uiTitlePanel2.Name = "uiTitlePanel2"; this.uiTitlePanel2.Name = "uiTitlePanel2";
this.uiTitlePanel2.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0); this.uiTitlePanel2.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
this.uiTitlePanel2.ShowCollapse = true; this.uiTitlePanel2.ShowCollapse = true;

2
SunnyUI/Controls/UIPagination.cs
View File

@ -846,7 +846,7 @@ namespace Sunny.UI
{ {
if (dataSource == null) if (dataSource == null)
{ {
PageChanged?.Invoke(this, dataSource, 1, 0); PageChanged?.Invoke(this, dataSource, activePage, 0);
return; return;
} }

8
SunnyUI/Controls/UITitlePanel.cs
View File

@ -275,10 +275,10 @@ namespace Sunny.UI
{ {
base.OnSizeChanged(e); base.OnSizeChanged(e);
CalcSystemBoxPos(); CalcSystemBoxPos();
if (!resizing) // if (!resizing)
{ // {
rowHeight = Height; // rowHeight = Height;
} // }
} }
protected override void OnMouseDoubleClick(MouseEventArgs e) protected override void OnMouseDoubleClick(MouseEventArgs e)