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

* 控件缩放部分代码修改

Browse Source
This commit is contained in:
Sunny 2022-04-07 17:49:50 +08:00
parent b6554b162c
commit 1580848281
23 changed files with 58 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Bin/net40/SunnyUI.dll
View File

Binary file not shown.

2
SunnyUI/Controls/Color/UIColorWheel.cs
View File

@ -36,7 +36,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
[Browsable(false)]

2
SunnyUI/Controls/Color/UILabelRotate.cs
View File

@ -11,7 +11,7 @@ namespace Sunny.UI
private ContentAlignment m_rotatePointAlignment = ContentAlignment.MiddleCenter;
private ContentAlignment m_textAlignment = ContentAlignment.MiddleLeft;
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]

2
SunnyUI/Controls/UIContextMenuStrip.cs
View File

@ -45,7 +45,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
[Browsable(false), DefaultValue(false)]

2
SunnyUI/Controls/UIControl.cs
View File

@ -49,7 +49,7 @@ namespace Sunny.UI
base.MinimumSize = new Size(1, 1);
}
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

2
SunnyUI/Controls/UIDataGridView.cs
View File

@ -103,7 +103,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

2
SunnyUI/Controls/UIImageButton.cs
View File

@ -44,7 +44,7 @@ namespace Sunny.UI
private ContentAlignment textAlign = ContentAlignment.MiddleCenter;
private Color foreColor = UIFontColor.Primary;
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]

2
SunnyUI/Controls/UIImageListBox.cs
View File

@ -345,7 +345,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
/// <summary>

4
SunnyUI/Controls/UILabel.cs
View File

@ -46,7 +46,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)
@ -191,7 +191,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

2
SunnyUI/Controls/UIListBox.cs
View File

@ -609,7 +609,7 @@ namespace Sunny.UI
{
private UIScrollBar bar;
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]

2
SunnyUI/Controls/UINavBar.cs
View File

@ -67,7 +67,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

2
SunnyUI/Controls/UINavMenu.cs
View File

@ -90,7 +90,7 @@ namespace Sunny.UI
selectedHighColor = UIStyles.Blue.NavMenuMenuSelectedColor;
}
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

2
SunnyUI/Controls/UISmoothLabel.cs
View File

@ -63,7 +63,7 @@ namespace Sunny.UI
base.Dispose(disposing);
}
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

2
SunnyUI/Controls/UISplitContainer.cs
View File

@ -82,7 +82,7 @@ namespace Sunny.UI
Version = UIGlobal.Version;
}
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

2
SunnyUI/Controls/UITabControl.cs
View File

@ -75,7 +75,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

2
SunnyUI/Controls/UITabControlMenu.cs
View File

@ -50,7 +50,7 @@ namespace Sunny.UI
_fillColor = UIStyles.Blue.TabControlBackColor;
}
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]

2
SunnyUI/Controls/UITableLayoutPanel.cs
View File

@ -33,7 +33,7 @@ namespace Sunny.UI
Version = UIGlobal.Version;
}
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
[Browsable(false)]

2
SunnyUI/Controls/UIUserControl.cs
View File

@ -345,7 +345,7 @@ namespace Sunny.UI
}
}
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

34
SunnyUI/Forms/UIForm.cs
View File

@ -115,8 +115,30 @@ namespace Sunny.UI
}
}
private void SetDesignedSize()
{
if (DesignedRect.Width == 0 && DesignedRect.Height == 0)
{
DesignedRect = new ControlScaleInfo(DesignedSize.Width, DesignedSize.Height, 0, 0);
}
if (DesignedRect.Width == 0 && DesignedRect.Height == 0)
{
DesignedRect = new ControlScaleInfo(this);
}
DesignSizeChanged?.Invoke(this, DesignedRect);
}
[DefaultValue(typeof(Size), "0, 0")]
[Description("设计界面大小"), Category("SunnyUI")]
public Size DesignedSize
{
get;
set;
}
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
private void SetControlScale()
@ -134,8 +156,12 @@ namespace Sunny.UI
UIDPIScale.SetControlScale(control, scale);
}
}
ControlScaleChanged?.Invoke(this, scale);
}
public event OnControlScaleChanged ControlScaleChanged;
public void ResetDPIScale()
{
IsScaled = false;
@ -1329,13 +1355,7 @@ namespace Sunny.UI
SetDesignedSize();
}
protected virtual void SetDesignedSize()
{
if (DesignedRect.Width == 0 && DesignedRect.Height == 0)
{
DesignedRect = new ControlScaleInfo(this); ;
}
}
public event OnDesignSizeChanged DesignSizeChanged;
/// <summary>
/// 是否显示圆角

4
SunnyUI/Forms/UIFormHelper.cs
View File

@ -30,6 +30,10 @@ using System.Windows.Forms;
namespace Sunny.UI
{
public delegate void OnControlScaleChanged(object sender, float scale);
public delegate void OnDesignSizeChanged(object sender, ControlScaleInfo info);
public static class UIMessageDialog
{
/// <summary>

2
SunnyUI/Frames/UIPage.cs
View File

@ -79,7 +79,7 @@ namespace Sunny.UI
[DefaultValue(false), Category("SunnyUI"), Description("禁止控件跟随窗体缩放")]
public bool ForbidControlScale { get; set; }
[Browsable(false), DefaultValue(typeof(Size), "0, 0")]
[Browsable(false)]
public ControlScaleInfo DesignedRect { get; private set; }
protected override void OnVisibleChanged(EventArgs e)

8
SunnyUI/Style/UIStyle.cs
View File

@ -77,6 +77,14 @@ namespace Sunny.UI
public int Width { get; }
public int Height { get; }
public ControlScaleInfo(int width, int height, int xInterval, int yInterval)
{
Width = width;
Height = height;
XInterval = xInterval;
YInterval = yInterval;
}
public ControlScaleInfo(Control control)
{
Width = control.Width;

6
SunnyUI/Style/UIStyleManager.cs
View File

@ -85,12 +85,6 @@ namespace Sunny.UI
set => UIStyles.FontSize = value;
}
public bool ControlScale
{
get => UIStyles.ControlScale;
set => UIStyles.ControlScale = value;
}
/// <summary>
/// 版本
/// </summary>