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

V3.2.3.1 修复一个Bug

Browse Source
This commit is contained in:
Sunny 2022-08-20 11:15:03 +08:00
parent e80fc7b29f
commit 556fa94a5d
10 changed files with 142 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
SunnyUI.Demo/Bin/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
SunnyUI.Demo/Bin/SunnyUI.dll
View File

Binary file not shown.

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

@ -54,6 +54,7 @@ namespace Sunny.UI.Demo
this.uiPanel1.TabIndex = 7;
this.uiPanel1.Text = "uiPanel1";
this.uiPanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiPanel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiTitlePanel2
//
@ -64,10 +65,12 @@ namespace Sunny.UI.Demo
this.uiTitlePanel2.Name = "uiTitlePanel2";
this.uiTitlePanel2.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
this.uiTitlePanel2.ShowCollapse = true;
this.uiTitlePanel2.ShowText = false;
this.uiTitlePanel2.Size = new System.Drawing.Size(270, 180);
this.uiTitlePanel2.TabIndex = 9;
this.uiTitlePanel2.Text = "uiTitlePanel2";
this.uiTitlePanel2.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiTitlePanel2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiGroupBox1
//
@ -81,6 +84,7 @@ namespace Sunny.UI.Demo
this.uiGroupBox1.TabIndex = 8;
this.uiGroupBox1.Text = "uiGroupBox1";
this.uiGroupBox1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiGroupBox1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiTitlePanel1
//
@ -90,10 +94,12 @@ namespace Sunny.UI.Demo
this.uiTitlePanel1.MinimumSize = new System.Drawing.Size(1, 1);
this.uiTitlePanel1.Name = "uiTitlePanel1";
this.uiTitlePanel1.Padding = new System.Windows.Forms.Padding(0, 35, 0, 0);
this.uiTitlePanel1.ShowText = false;
this.uiTitlePanel1.Size = new System.Drawing.Size(270, 180);
this.uiTitlePanel1.TabIndex = 6;
this.uiTitlePanel1.Text = "uiTitlePanel1";
this.uiTitlePanel1.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiTitlePanel1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiTableLayoutPanel1
//
@ -127,6 +133,7 @@ namespace Sunny.UI.Demo
this.uiButton4.TabIndex = 5;
this.uiButton4.Text = "uiButton4";
this.uiButton4.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiButton4.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiButton3
//
@ -140,6 +147,7 @@ namespace Sunny.UI.Demo
this.uiButton3.TabIndex = 4;
this.uiButton3.Text = "uiButton3";
this.uiButton3.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiButton3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiButton2
//
@ -153,6 +161,7 @@ namespace Sunny.UI.Demo
this.uiButton2.TabIndex = 1;
this.uiButton2.Text = "uiButton2";
this.uiButton2.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiButton2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiButton1
//
@ -166,6 +175,7 @@ namespace Sunny.UI.Demo
this.uiButton1.TabIndex = 0;
this.uiButton1.Text = "uiButton1";
this.uiButton1.TipsFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uiButton1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiLine1
//
@ -177,6 +187,7 @@ namespace Sunny.UI.Demo
this.uiLine1.TabIndex = 78;
this.uiLine1.Text = "UITableLayoutPanel";
this.uiLine1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.uiLine1.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// uiLine2
//
@ -188,6 +199,7 @@ namespace Sunny.UI.Demo
this.uiLine2.TabIndex = 79;
this.uiLine2.Text = "UIPanel";
this.uiLine2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.uiLine2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// FPanel
//

4
SunnyUI.Demo/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.2.3.0")]
[assembly: AssemblyFileVersion("3.2.3.0")]
[assembly: AssemblyVersion("3.2.3.1")]
[assembly: AssemblyFileVersion("3.2.3.1")]

4
SunnyUI.Demo/SunnyUI.Demo.csproj
View File

@ -38,8 +38,8 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<ItemGroup>
<Reference Include="SunnyUI, Version=3.2.3.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.3.2.3\lib\net40\SunnyUI.dll</HintPath>
<Reference Include="SunnyUI, Version=3.2.3.1, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.3.2.3.1\lib\net40\SunnyUI.dll</HintPath>
</Reference>
<Reference Include="SunnyUI.Common, Version=3.2.0.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.Common.3.2.0\lib\net40\SunnyUI.Common.dll</HintPath>

2
SunnyUI.Demo/packages.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SunnyUI" version="3.2.3" targetFramework="net40" />
<package id="SunnyUI" version="3.2.3.1" targetFramework="net40" />
<package id="SunnyUI.Common" version="3.2.0" targetFramework="net40" />
</packages>

2
SunnyUI/Controls/UIGlobal.cs
View File

@ -31,7 +31,7 @@ namespace Sunny.UI
/// <summary>
/// 版本
/// </summary>
public const string Version = "SunnyUI.Net V3.2.3";
public const string Version = "SunnyUI.Net V3.2.3.1";
public const int EditorMinHeight = 20;
public const int EditorMaxHeight = 60;

1
SunnyUI/Controls/UIUserControl.cs
View File

@ -29,6 +29,7 @@ using System.Windows.Forms;
#pragma warning disable 1591
namespace Sunny.UI
{
[Designer("System.Windows.Forms.Design.ParentControlDesigner, System.Design", typeof(System.ComponentModel.Design.IDesigner))]
[DefaultEvent("Click"), DefaultProperty("Text")]
public partial class UIUserControl : UserControl, IStyleInterface, IZoomScale
{

120
SunnyUI/Controls/UIUserControl.resx Normal file
View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

6
SunnyUI/SunnyUI.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net472;net40</TargetFrameworks>
<TargetFrameworks>net472;net40</TargetFrameworks>
<LangVersion>8.0</LangVersion>
<ProjectGuid>{AB1CB247-E20B-4CBE-B269-570ADDD96C53}</ProjectGuid>
<UseWindowsForms>true</UseWindowsForms>
@ -9,7 +9,7 @@
<Description>SunnyUI.Net 是基于.Net Framework 4.0~4.8、.Net 6 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
<Copyright>CopyRight © SunnyUI.Net 2012-2022</Copyright>
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
<Version>3.2.3</Version>
<Version>3.2.3.1</Version>
<Authors>ShenYonghua</Authors>
<Company>SunnyUI.Net</Company>
<PackageId>SunnyUI</PackageId>
@ -20,7 +20,7 @@
<SignAssembly>False</SignAssembly>
<AssemblyOriginatorKeyFile>D:\MyDocuments\SunnyUI.pfx</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<GenerateDocumentationFile>False</GenerateDocumentationFile>
</PropertyGroup>