### 2021-03-13更新

------
#### ryControlsV4    V2.1.2103.1301
*.[改进]改进Gdu.WinformUI在窗体FormBorderStyle为None时最大化会覆盖状态栏的问题。
This commit is contained in:
鑫Intel 2021-03-14 10:39:38 +08:00
parent 662a6786d2
commit f2d673f7e8
52 changed files with 631 additions and 256 deletions

View File

@ -0,0 +1,23 @@
2021/3/13 16:06:28
错误描述:未将对象引用设置到对象的实例。
异常堆栈: 在 MGdu.WinFormUI.GMForm.OnSizeChanged(EventArgs e) 位置 E:\My Datas\毕方项目\C#\睿元公用控件组\Source\ryControls\Gdu.WinFormUI\Forms\GMForm.cs:行号 1495
在 System.Windows.Forms.Control.UpdateBounds(Int32 x, Int32 y, Int32 width, Int32 height, Int32 clientWidth, Int32 clientHeight)
在 System.Windows.Forms.Control.UpdateBounds(Int32 x, Int32 y, Int32 width, Int32 height)
在 System.Windows.Forms.Control.SetBoundsCore(Int32 x, Int32 y, Int32 width, Int32 height, BoundsSpecified specified)
在 System.Windows.Forms.Form.SetBoundsCore(Int32 x, Int32 y, Int32 width, Int32 height, BoundsSpecified specified)
在 MGdu.WinFormUI.GMForm.SetBoundsCore(Int32 x, Int32 y, Int32 width, Int32 height, BoundsSpecified specified) 位置 E:\My Datas\毕方项目\C#\睿元公用控件组\Source\ryControls\Gdu.WinFormUI\Forms\GMForm.cs:行号 1431
在 System.Windows.Forms.Control.SetBounds(Int32 x, Int32 y, Int32 width, Int32 height, BoundsSpecified specified)
在 System.Windows.Forms.Control.set_Size(Size value)
在 System.Windows.Forms.Control.SetClientSizeCore(Int32 x, Int32 y)
在 System.Windows.Forms.Form.SetClientSizeCore(Int32 x, Int32 y)
在 MGdu.WinFormUI.GMForm.SetClientSizeCore(Int32 x, Int32 y) 位置 E:\My Datas\毕方项目\C#\睿元公用控件组\Source\ryControls\Gdu.WinFormUI\Forms\GMForm.cs:行号 1457
在 System.Windows.Forms.Control.set_ClientSize(Size value)
在 System.Windows.Forms.Form.set_ClientSize(Size value)
在 MGdu.WinFormUI.GMForm.InitializeComponent() 位置 E:\My Datas\毕方项目\C#\睿元公用控件组\Source\ryControls\Gdu.WinFormUI\Forms\GMForm.Designer.cs:行号 37
在 MGdu.WinFormUI.GMForm..ctor() 位置 E:\My Datas\毕方项目\C#\睿元公用控件组\Source\ryControls\Gdu.WinFormUI\Forms\GMForm.cs:行号 769
在 Itrycn_Project2.FrmTest..ctor() 位置 E:\My Datas\毕方项目\C#\睿元公用控件组\Source\Itrycn_Project2\FrmTest.cs:行号 14
在 Itrycn_Project.Program.Main(String[] args) 位置 E:\My Datas\毕方项目\C#\睿元公用控件组\Source\Itrycn_Project2\Program.cs:行号 35
异常方法Void OnSizeChanged(System.EventArgs)

View File

@ -1,4 +1,9 @@
### 2021-02-28更新
### 2021-03-13更新
------
#### ryControlsV4 V2.1.2103.1301
*.[改进]改进Gdu.WinformUI在窗体FormBorderStyle为None时最大化会覆盖状态栏的问题。
### 2021-02-28更新
------
#### ryControls V2.1.2102.2801
- *.[新增]新增部分WinAPI的注释。

View File

@ -0,0 +1,62 @@

namespace Itrycn_Project2
{
partial class FrmTest
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.buttonEx1 = new ryControls.ButtonEx();
this.SuspendLayout();
//
// buttonEx1
//
this.buttonEx1.BaseColor = System.Drawing.Color.FromArgb(((int)(((byte)(51)))), ((int)(((byte)(76)))), ((int)(((byte)(95)))));
this.buttonEx1.Location = new System.Drawing.Point(320, 357);
this.buttonEx1.Name = "buttonEx1";
this.buttonEx1.Size = new System.Drawing.Size(75, 50);
this.buttonEx1.TabIndex = 0;
this.buttonEx1.Text = "buttonEx1";
this.buttonEx1.UseVisualStyleBackColor = true;
//
// FrmTest
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(403, 417);
this.Controls.Add(this.buttonEx1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.IconSize = new System.Drawing.Size(20, 20);
this.Name = "FrmTest";
this.Text = "FrmTest";
this.ResumeLayout(false);
}
#endregion
private ryControls.ButtonEx buttonEx1;
}
}

View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
namespace Itrycn_Project2
{
public partial class FrmTest : MGdu.WinFormUI.GMForm
{
public FrmTest()
{
InitializeComponent();
}
}
}

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>

View File

@ -1,189 +1,198 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{DC9FDB61-FEDD-4795-AFDC-8376AB781C56}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>Itrycn_Project2</RootNamespace>
<AssemblyName>Itrycn_Project2</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Bin\Debug\CommonControls\.NET4 示例\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Bin\Release\CommonControls\.NET4 示例\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="RyWeb">
<HintPath>..\..\Bin\Debug\CommonControls\.NET4\RyWeb.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="XPTable">
<HintPath>..\..\Bin\Debug\CommonControls\.NET4\XPTable.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="clsForm.cs" />
<Compile Include="Config\Itrycn_Db.cs" />
<Compile Include="Config\Soft_Config.cs" />
<Compile Include="DbOp\FrmAdd.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DbOp\FrmAdd.Designer.cs">
<DependentUpon>FrmAdd.cs</DependentUpon>
</Compile>
<Compile Include="DbOp\FrmView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DbOp\FrmView.Designer.cs">
<DependentUpon>FrmView.cs</DependentUpon>
</Compile>
<Compile Include="FrmAbout.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmAbout.Designer.cs">
<DependentUpon>FrmAbout.cs</DependentUpon>
</Compile>
<Compile Include="FrmStart.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmStart.Designer.cs">
<DependentUpon>FrmStart.cs</DependentUpon>
</Compile>
<Compile Include="OTools\FrmScan.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="OTools\FrmScan.Designer.cs">
<DependentUpon>FrmScan.cs</DependentUpon>
</Compile>
<Compile Include="OTools\RegSoft\frmLogin.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="OTools\RegSoft\frmLogin.Designer.cs">
<DependentUpon>frmLogin.cs</DependentUpon>
</Compile>
<Compile Include="frmSetting.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmSetting.Designer.cs">
<DependentUpon>frmSetting.cs</DependentUpon>
</Compile>
<Compile Include="Config\Soft_Info.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="DbOp\FrmAdd.resx">
<DependentUpon>FrmAdd.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DbOp\FrmView.resx">
<DependentUpon>FrmView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmAbout.resx">
<DependentUpon>FrmAbout.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmStart.resx">
<DependentUpon>FrmStart.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OTools\FrmScan.resx">
<DependentUpon>FrmScan.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OTools\RegSoft\frmLogin.resx">
<DependentUpon>frmLogin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmSetting.resx">
<DependentUpon>frmSetting.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MyDb\MyDbV4.csproj">
<Project>{9df20d86-a56e-4cf6-a3d8-f30421297b1b}</Project>
<Name>MyDbV4</Name>
</ProjectReference>
<ProjectReference Include="..\MyDb_SQLite\MyDb_SQLiteV4.csproj">
<Project>{6b969ce8-d723-4b2c-a8fd-fad2fb28ff01}</Project>
<Name>MyDb_SQLiteV4</Name>
</ProjectReference>
<ProjectReference Include="..\ryControls\ryControlsV4.csproj">
<Project>{9eca3a84-8545-4c4d-84d6-d23e3bdf2d90}</Project>
<Name>ryControlsV4</Name>
</ProjectReference>
<ProjectReference Include="..\RyPrint\RyPrint.csproj">
<Project>{B6784652-825A-482C-8A21-08E2539AF2BF}</Project>
<Name>RyPrint</Name>
</ProjectReference>
<ProjectReference Include="..\ryUpdate\ryUpdateV4.csproj">
<Project>{11a63e24-0257-4c54-a109-f1a609a52a62}</Project>
<Name>ryUpdateV4</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Folder Include="API\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{DC9FDB61-FEDD-4795-AFDC-8376AB781C56}</ProjectGuid>
<OutputType>WinExe</OutputType>
<RootNamespace>Itrycn_Project2</RootNamespace>
<AssemblyName>Itrycn_Project2</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Bin\Debug\CommonControls\.NET4 示例\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Bin\Release\CommonControls\.NET4 示例\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="RyWeb">
<HintPath>..\..\Bin\Debug\CommonControls\.NET4\RyWeb.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="XPTable">
<HintPath>..\..\Bin\Debug\CommonControls\.NET4\XPTable.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="clsForm.cs" />
<Compile Include="Config\Itrycn_Db.cs" />
<Compile Include="Config\Soft_Config.cs" />
<Compile Include="DbOp\FrmAdd.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DbOp\FrmAdd.Designer.cs">
<DependentUpon>FrmAdd.cs</DependentUpon>
</Compile>
<Compile Include="DbOp\FrmView.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DbOp\FrmView.Designer.cs">
<DependentUpon>FrmView.cs</DependentUpon>
</Compile>
<Compile Include="FrmAbout.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmAbout.Designer.cs">
<DependentUpon>FrmAbout.cs</DependentUpon>
</Compile>
<Compile Include="FrmStart.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmStart.Designer.cs">
<DependentUpon>FrmStart.cs</DependentUpon>
</Compile>
<Compile Include="FrmTest.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmTest.Designer.cs">
<DependentUpon>FrmTest.cs</DependentUpon>
</Compile>
<Compile Include="OTools\FrmScan.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="OTools\FrmScan.Designer.cs">
<DependentUpon>FrmScan.cs</DependentUpon>
</Compile>
<Compile Include="OTools\RegSoft\frmLogin.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="OTools\RegSoft\frmLogin.Designer.cs">
<DependentUpon>frmLogin.cs</DependentUpon>
</Compile>
<Compile Include="frmSetting.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmSetting.Designer.cs">
<DependentUpon>frmSetting.cs</DependentUpon>
</Compile>
<Compile Include="Config\Soft_Info.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<EmbeddedResource Include="DbOp\FrmAdd.resx">
<DependentUpon>FrmAdd.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DbOp\FrmView.resx">
<DependentUpon>FrmView.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmAbout.resx">
<DependentUpon>FrmAbout.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmStart.resx">
<DependentUpon>FrmStart.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmTest.resx">
<DependentUpon>FrmTest.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OTools\FrmScan.resx">
<DependentUpon>FrmScan.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="OTools\RegSoft\frmLogin.resx">
<DependentUpon>frmLogin.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmSetting.resx">
<DependentUpon>frmSetting.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MyDb\MyDbV4.csproj">
<Project>{9df20d86-a56e-4cf6-a3d8-f30421297b1b}</Project>
<Name>MyDbV4</Name>
</ProjectReference>
<ProjectReference Include="..\MyDb_SQLite\MyDb_SQLiteV4.csproj">
<Project>{6b969ce8-d723-4b2c-a8fd-fad2fb28ff01}</Project>
<Name>MyDb_SQLiteV4</Name>
</ProjectReference>
<ProjectReference Include="..\ryControls\ryControlsV4.csproj">
<Project>{9eca3a84-8545-4c4d-84d6-d23e3bdf2d90}</Project>
<Name>ryControlsV4</Name>
</ProjectReference>
<ProjectReference Include="..\RyPrint\RyPrint.csproj">
<Project>{B6784652-825A-482C-8A21-08E2539AF2BF}</Project>
<Name>RyPrint</Name>
</ProjectReference>
<ProjectReference Include="..\ryUpdate\ryUpdateV4.csproj">
<Project>{11a63e24-0257-4c54-a109-f1a609a52a62}</Project>
<Name>ryUpdateV4</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Folder Include="API\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@ -31,8 +31,8 @@ namespace Itrycn_Project
}
else
{
Application.Run(new FrmStart(args));
//Application.Run(new WindowsFormsApp2.Form1());
//Application.Run(new FrmStart(args));
Application.Run(new FrmTest());
}
//FrmLogin frm = new FrmLogin();
//if (frm.ShowDialog() == DialogResult.OK)

View File

@ -1,36 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("Itrycn_Project")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Itrycn_Project")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
[assembly: Guid("62b5c3e8-4af1-4a7f-a40b-a6186f83dbd2")]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 有关程序集的一般信息由以下
// 控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("Itrycn_Project")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Itrycn_Project")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// 将 ComVisible 设置为 false 会使此程序集中的类型
//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
//请将此类型的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]
// 如果此项目向 COM 公开,则下列 GUID 用于类型库的 ID
[assembly: Guid("62b5c3e8-4af1-4a7f-a40b-a6186f83dbd2")]
// 程序集的版本信息由下列四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
// 可以指定所有值,也可以使用以下所示的 "*" 预置版本号和修订号
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.2103.1301")]
[assembly: AssemblyFileVersion("1.0.2103.1301")]

Binary file not shown.

Binary file not shown.

View File

@ -25,8 +25,12 @@ namespace MGdu.WinFormUI
}
private void MaxBtnClick(object sender, EventArgs e)
{
{
var MaximumSize = _owner.MaximumSize;
var curScreen = Screen.FromControl(_owner);
_owner.MaximumSize = new Size(curScreen.WorkingArea.Width, curScreen.WorkingArea.Height);
_owner.WindowState = FormWindowState.Maximized;
_owner.MaximumSize = MaximumSize;
}
private void ResBtnClick(object sender, EventArgs e)

View File

@ -28,9 +28,18 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Text = "GMForm";
this.SuspendLayout();
//
// GMForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(284, 261);
this.Name = "GMForm";
this.Text = "GMForm";
this.Load += new System.EventHandler(this.GMForm_Load);
this.ResumeLayout(false);
}
#endregion

View File

@ -787,7 +787,6 @@ namespace MGdu.WinFormUI
this.DoubleBuffered = true;
this.UpdateStyles();
base.Padding = DefaultPadding;
if (ControlBox)
controlBoxManager = new ControlBoxManager(this);
}
@ -1354,9 +1353,8 @@ namespace MGdu.WinFormUI
/// <param name="m"></param>
protected override void WndProc(ref Message m)
{
if (this.DesignMode) { base.WndProc(ref m); return; }
//if (this.DesignMode) { base.WndProc(ref m); return; }
bool alreadyHandled = false;
switch (m.Msg)
{
case (int)Win32.WinAPI.WindowMessages.WM_NCCALCSIZE:
@ -1388,9 +1386,9 @@ namespace MGdu.WinFormUI
protected override void OnPaint(PaintEventArgs e)
{
base.OnPaint(e);
DrawFormBackground(e.Graphics);
DrawCaptionBackground(e.Graphics);
DrawFormBorder(e.Graphics);
DrawFormIconAndText(e.Graphics);
@ -1411,19 +1409,17 @@ namespace MGdu.WinFormUI
{
//base.OnPaintBackground(e);
}
/// <summary>
/// 重写该方法解决窗体每次还原都会变大的问题
/// </summary>
protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)
{
if (this.DesignMode) { base.SetBoundsCore(x, y, width, height, specified); return; }
if (base.WindowState == FormWindowState.Normal)
{
if (this.Size == this.ClientSize)
{
//if (width == (this.Size.Width + SystemInformation.FrameBorderSize.Width * 2))
if (width == (this.Size.Width + 4 * 2) || width == (this.Size.Width + 8 * 2))
if (width == (this.Size.Width + 16))
{
width = this.Size.Width;
height = this.Size.Height;
@ -1443,19 +1439,20 @@ namespace MGdu.WinFormUI
// base.Size.ToString() + ", clisize:" + base.ClientSize.ToString()
// + ", x:" + x.ToString() + ", y:" + y.ToString());
//if (base.WindowState == FormWindowState.Normal && DesignMode)
//{
// if (base.Size != base.ClientSize)
// {
// int diffx = Size.Width - ClientSize.Width;
// int diffy = Size.Height - ClientSize.Height;
// if (diffx == 4 * 2 || diffx == 8 * 2)
// {
// x -= diffx;
// y -= diffy;
// }
// }
//}
if (base.WindowState == FormWindowState.Normal && DesignMode)
{
if (base.Size != base.ClientSize)
{
int diffx = Size.Width - ClientSize.Width;
int diffy = Size.Height - ClientSize.Height;
//MessageBox.Show(diffx+"-"+ diffy);
if (diffx == 16)
{
x -= diffx;
y -= diffy;
}
}
}
base.SetClientSizeCore(x, y);
//MessageBox.Show(base.SizeFromClientSize(new Size(x,y)).ToString());
@ -1680,9 +1677,13 @@ namespace MGdu.WinFormUI
controlBoxManager.MouseOperation(Point.Empty, MouseOperationType.Leave);
if (IsMdiContainer && _mdiBarController != null)
_mdiBarController.MouseOperation(Point.Empty, MouseOperationType.Leave);
}
}
#endregion
private void GMForm_Load(object sender, EventArgs e)
{
//var size = this.ClientSize;
}
}
}

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>

View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: :
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.2102.2801")]
[assembly: AssemblyFileVersion("2.1.2102.2801")]
[assembly: AssemblyVersion("2.1.2103.1301")]
[assembly: AssemblyFileVersion("2.1.2103.1301")]

View File

@ -559,6 +559,9 @@
<EmbeddedResource Include="Controls\TextBoxEx2.resx">
<DependentUpon>TextBoxEx2.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Gdu.WinFormUI\Forms\GMForm.resx">
<DependentUpon>GMForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Gdu.WinFormUI\Forms\GMShadow.resx">
<DependentUpon>GMShadow.cs</DependentUpon>
</EmbeddedResource>