Commit a8914816 顾剑亮

修改bug

1 个父辈 6fa58cee
正在显示 38 个修改的文件 包含 652 行增加30 行删除
......@@ -34,7 +34,7 @@ namespace Asa.FaceControl
// FormBase
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(457, 369);
this.ClientSize = new System.Drawing.Size(385, 340);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "FormBase";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
......
......@@ -14,8 +14,11 @@ namespace Asa.FaceControl
[DefaultEvent("SelectedIndexChanged")]
public partial class FaceComboBox : ControlBase
{
private bool _showDel = false;
private CtlComboArrow arrow;
private TextBox ctlText;
private CtlDel ctlDel;
private FaceListBox listbox;
public FaceComboBox()
......@@ -32,8 +35,14 @@ namespace Asa.FaceControl
ctlText.MouseEnter += CtlText_MouseEnter;
ctlText.MouseLeave += CtlText_MouseLeave;
ctlText.TextChanged += CtlText_TextChanged;
ctlDel = new() { Visible = false, TabStop = false };
ctlDel.Click += CtlDel_Click;
ctlDel.MouseEnter += CtlDel_MouseEnter;
ctlDel.MouseLeave += CtlDel_MouseLeave;
Controls.Add(arrow);
Controls.Add(ctlText);
Controls.Add(ctlDel);
GotFocus += FaceTextBox_GotFocus;
}
......@@ -52,7 +61,18 @@ namespace Asa.FaceControl
[Browsable(true), Category("外观"), Description("指示应该如何对齐编辑控件的文本"), DefaultValue(HorizontalAlignment.Left)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public HorizontalAlignment TextAlign { set => ctlText.TextAlign = value; get => ctlText.TextAlign; }
public HorizontalAlignment TextAlign
{
set
{
ctlText.TextAlign = value;
listbox.TextAlign = value;
}
get
{
return ctlText.TextAlign;
}
}
[Browsable(true), Category("外观"), Description("用于显示控件中文本的字体")]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
......@@ -70,6 +90,19 @@ namespace Asa.FaceControl
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public override string Text { get => ctlText.Text; set => ctlText.Text = value; }
[Browsable(true), DefaultValue(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Visible)]
public bool ShowDel
{
get => _showDel;
set
{
_showDel = value;
CalcSize();
Refresh();
}
}
[Browsable(false)]
public FaceListBox.Item Items { get => listbox.Items; }
......@@ -78,17 +111,33 @@ namespace Asa.FaceControl
protected override void CalcSize()
{
base.CalcSize();
int l = Width - BorderWidth - 1;
if (arrow != null)
{
arrow.Top = BorderWidth + 1;
arrow.Height = Height - BorderWidth - BorderWidth - 2;
arrow.Width = 30;
arrow.Left = Width - BorderWidth - arrow.Width - 1;
l -= arrow.Width;
arrow.Left = l;
}
if (ctlDel != null)
{
if (_showDel)
{
ctlDel.Top = arrow.Top;
ctlDel.Height = arrow.Height;
ctlDel.Width = arrow.Width;
l -= ctlDel.Width;
ctlDel.Left = l;
}
ctlDel.Visible = _showDel;
}
if (ctlText != null)
{
ctlText.Width = arrow.Left - BorderWidth - 5;
ctlText.Width = l - 5;
ctlText.Left = BorderWidth + 3;
ctlText.Top = (Height - ctlText.Height) / 2 + 1;
}
......@@ -112,9 +161,14 @@ namespace Asa.FaceControl
listbox.Visible = false;
}
private void FaceTextBox_GotFocus(object sender, EventArgs e)
{
ctlText.Focus();
}
private void Listbox_SelectedIndexChanged(object sender, EventArgs e)
{
ctlText.Text = listbox.Items[listbox.SelectedIndex];
ctlText.Text = listbox.SelectedIndex == -1 ? "" : listbox.Items[listbox.SelectedIndex];
HideDropDown();
arrow.Press = false;
SelectedIndexChanged?.Invoke(this, new EventArgs());
......@@ -172,6 +226,22 @@ namespace Asa.FaceControl
// KeyPress?.Invoke(this, e);
}
private void CtlDel_Click(object sender, EventArgs e)
{
ctlText.Text = "";
}
private void CtlDel_MouseEnter(object sender, EventArgs e)
{
borderEnter = true;
Refresh();
}
private void CtlDel_MouseLeave(object sender, EventArgs e)
{
borderEnter = false;
Refresh();
}
}
}
......@@ -345,8 +345,15 @@ namespace Asa.FaceControl
public void Add(string s)
{
if (s == null) return;
//s = s.Replace('\r', '\0');
//s = s.Replace('\n', '\0');
list.Add(s);
_action?.Invoke();
}
public void AddWithoutExist(string s)
{
if (s == null) return;
int index = list.FindIndex(match => match == s);
if (index > -1) return;
list.Add(s);
_action?.Invoke();
}
......@@ -354,15 +361,21 @@ namespace Asa.FaceControl
public void AddRange(params string[] s)
{
if (s == null) return;
//for (int i = 0; i < s.Length; i++)
//{
// s[i] = s[i].Replace('\r', '\0');
// s[i] = s[i].Replace('\n', '\0');
//}
list.AddRange(s);
_action?.Invoke();
}
public void AddRangeWithoutExist(params string[] s)
{
if (s == null) return;
for (int i = 0; i < s.Length; i++)
{
int index = list.FindIndex(match => match == s[i]);
if (index == -1) list.Add(s[i]);
}
_action?.Invoke();
}
public void Remove(string s)
{
if (s == null) return;
......

namespace Asa.FaceControl
{
partial class FaceLoading
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// 清理所有正在使用的资源。
/// </summary>
/// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region 组件设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要修改
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// FaceLoading
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Name = "FaceLoading";
this.Size = new System.Drawing.Size(283, 278);
this.ResumeLayout(false);
}
#endregion
}
}
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Asa.FaceControl
{
public partial class FaceLoading : ControlBase
{
private bool loop = false;
private int circleIndex = -1;
private readonly int circleCount = 12;
private readonly int circleRadius = 10;
private List<RectangleF> circleCenter;
public FaceLoading()
{
InitializeComponent();
circleCenter = new();
}
public void Start()
{
loop = true;
System.Threading.Thread thread = new System.Threading.Thread(new System.Threading.ThreadStart(Run));
thread.Start();
}
public void Stop()
{
loop = false;
circleIndex = -1;
Refresh();
}
protected override void CalcSize()
{
base.CalcSize();
PointF center = new(Width / 2f, Height / 2f);
float radius = Math.Min(center.X * 2f / 3f, center.Y * 2f / 3f);
circleCenter = new();
for (int i = 0; i < circleCount; i++)
{
double angle = 360d / circleCount * i;
angle = Math.PI * angle / 180;
float x = Convert.ToSingle(center.X + Math.Sin(angle) * radius);
float y = Convert.ToSingle(center.Y - Math.Cos(angle) * radius);
circleCenter.Add(new RectangleF(x - circleRadius, y - circleRadius, circleRadius * 2, circleRadius * 2));
}
}
protected override void DrawEnabled(Graphics g)
{
base.DrawEnabled(g);
for (int i = 0; i < circleCenter.Count; i++)
{
if (i == circleIndex)
g.FillEllipse(new SolidBrush(theme.DOWN), circleCenter[i]);
else
g.FillEllipse(new SolidBrush(theme.FORE), circleCenter[i]);
}
}
protected override void DrawDisabled(Graphics g)
{
base.DrawDisabled(g);
}
private void Run()
{
circleIndex = 0;
try
{
while (loop)
{
Invoke(new Action(() => { Refresh(); }));
System.Threading.Thread.Sleep(100);
circleIndex++;
if (circleIndex == circleCount) circleIndex = 0;
}
}
catch (Exception ex)
{
}
}
}
}
<?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>
\ No newline at end of file
......@@ -173,6 +173,18 @@
<Compile Include="Control\FacePasswordLock.Designer.cs">
<DependentUpon>FacePasswordLock.cs</DependentUpon>
</Compile>
<Compile Include="Control\FaceLoading.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Control\FaceLoading.Designer.cs">
<DependentUpon>FaceLoading.cs</DependentUpon>
</Compile>
<Compile Include="FaceLoadBox.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FaceLoadBox.Designer.cs">
<DependentUpon>FaceLoadBox.cs</DependentUpon>
</Compile>
<Compile Include="Form\FaceFormFixed.cs">
<SubType>Form</SubType>
</Compile>
......@@ -316,6 +328,12 @@
<EmbeddedResource Include="Control\FacePasswordLock.resx">
<DependentUpon>FacePasswordLock.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Control\FaceLoading.resx">
<DependentUpon>FaceLoading.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FaceLoadBox.resx">
<DependentUpon>FaceLoadBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Form\FaceFormFixed.resx">
<DependentUpon>FaceFormFixed.cs</DependentUpon>
</EmbeddedResource>
......

namespace Asa.FaceControl
{
partial class FaceLoadBox
{
/// <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.faceLoading1 = new Asa.FaceControl.FaceLoading();
this.SuspendLayout();
//
// faceLoading1
//
this.faceLoading1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.faceLoading1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.faceLoading1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceLoading1.BorderWidth = 2;
this.faceLoading1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceLoading1.Location = new System.Drawing.Point(11, 43);
this.faceLoading1.Name = "faceLoading1";
this.faceLoading1.Padding = new System.Windows.Forms.Padding(3);
this.faceLoading1.Size = new System.Drawing.Size(450, 307);
this.faceLoading1.TabIndex = 0;
this.faceLoading1.Text = "faceLoading1";
//
// FaceLoadBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(472, 361);
this.Controls.Add(this.faceLoading1);
this.Location = new System.Drawing.Point(0, 0);
this.Name = "FaceLoadBox";
this.Text = "FaceLoadBox";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FaceLoadBox_FormClosing);
this.Load += new System.EventHandler(this.FaceLoadBox_Load);
this.ResumeLayout(false);
}
#endregion
private FaceLoading faceLoading1;
}
}
\ No newline at end of file
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Asa.FaceControl
{
public partial class FaceLoadBox : FormBase
{
public FaceLoadBox()
{
InitializeComponent();
}
private void FaceLoadBox_Load(object sender, EventArgs e)
{
faceLoading1.Start();
}
private void FaceLoadBox_FormClosing(object sender, FormClosingEventArgs e)
{
faceLoading1.Stop();
}
}
}
<?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>
\ No newline at end of file
......@@ -58,7 +58,7 @@ namespace Asa.FaceControl
// FaceFormNormal
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(406, 276);
this.ClientSize = new System.Drawing.Size(441, 308);
this.Controls.Add(this.ctlMin);
this.Controls.Add(this.ctlMax);
this.Controls.Add(this.ctlClose);
......
05a9b237bc12fc48caeb4f3fde8177dc3bab69a5
c119d35507cdf3dbdd61dbcb4425317d50b7ddca
......@@ -78,3 +78,6 @@ C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.Resource1.re
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.GenerateResource.cache
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.CoreCompileInputs.cache
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.CopyComplete
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceLoading.resources
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\Asa.FaceControl.FaceLoadBox.resources
C:\Neotel\Program\FaceControl\FaceControl\obj\Debug\FaceControl.csproj.AssemblyReference.cache
......@@ -29,39 +29,60 @@ namespace Test
/// </summary>
private void InitializeComponent()
{
this.facePasswordLock1 = new Asa.FaceControl.FacePasswordLock();
this.faceButton1 = new Asa.FaceControl.FaceButton();
this.faceButton2 = new Asa.FaceControl.FaceButton();
this.SuspendLayout();
//
// facePasswordLock1
// faceButton1
//
this.facePasswordLock1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.facePasswordLock1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.facePasswordLock1.BorderWidth = 2;
this.facePasswordLock1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.facePasswordLock1.Location = new System.Drawing.Point(201, 140);
this.facePasswordLock1.Name = "facePasswordLock1";
this.facePasswordLock1.Padding = new System.Windows.Forms.Padding(3);
this.facePasswordLock1.Size = new System.Drawing.Size(240, 240);
this.facePasswordLock1.TabIndex = 3;
this.facePasswordLock1.Text = "facePasswordLock1";
this.faceButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.faceButton1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceButton1.BorderWidth = 2;
this.faceButton1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceButton1.HoldPress = false;
this.faceButton1.Location = new System.Drawing.Point(140, 176);
this.faceButton1.Name = "faceButton1";
this.faceButton1.Padding = new System.Windows.Forms.Padding(3);
this.faceButton1.Size = new System.Drawing.Size(162, 76);
this.faceButton1.TabIndex = 3;
this.faceButton1.Text = "faceButton1";
this.faceButton1.Click += new System.EventHandler(this.faceButton1_Click);
//
// faceButton2
//
this.faceButton2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.faceButton2.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceButton2.BorderWidth = 2;
this.faceButton2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceButton2.HoldPress = false;
this.faceButton2.Location = new System.Drawing.Point(308, 176);
this.faceButton2.Name = "faceButton2";
this.faceButton2.Padding = new System.Windows.Forms.Padding(3);
this.faceButton2.Size = new System.Drawing.Size(146, 76);
this.faceButton2.TabIndex = 4;
this.faceButton2.Text = "faceButton2";
this.faceButton2.Click += new System.EventHandler(this.faceButton2_Click);
//
// Form1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(713, 470);
this.Controls.Add(this.facePasswordLock1);
this.Controls.Add(this.faceButton2);
this.Controls.Add(this.faceButton1);
this.Name = "Form1";
this.Text = "Form1";
this.Load += new System.EventHandler(this.Form1_Load);
this.Controls.SetChildIndex(this.facePasswordLock1, 0);
this.Controls.SetChildIndex(this.faceButton1, 0);
this.Controls.SetChildIndex(this.faceButton2, 0);
this.ResumeLayout(false);
}
#endregion
private Asa.FaceControl.FacePasswordLock facePasswordLock1;
private Asa.FaceControl.FaceButton faceButton1;
private Asa.FaceControl.FaceButton faceButton2;
}
}
......@@ -12,6 +12,9 @@ namespace Test
{
public partial class Form1 : Asa.FaceControl.FaceFormNormal
{
Asa.FaceControl.FaceLoadBox box = new Asa.FaceControl.FaceLoadBox();
public Form1()
{
InitializeComponent();
......@@ -21,6 +24,16 @@ namespace Test
{
}
private void faceButton1_Click(object sender, EventArgs e)
{
box.TopMost = true;
box.Show();
}
private void faceButton2_Click(object sender, EventArgs e)
{
box.Close();
}
}
}
......@@ -16,7 +16,6 @@ C:\Neotel\Program\FaceControl\Test\bin\Debug\Test.exe
C:\Neotel\Program\FaceControl\Test\bin\Debug\Test.pdb
C:\Neotel\Program\FaceControl\Test\bin\Debug\Asa.Face.Control.dll
C:\Neotel\Program\FaceControl\Test\bin\Debug\Asa.Face.Control.pdb
C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.csprojAssemblyReference.cache
C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.Form1.resources
C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.Properties.Resources.resources
C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.csproj.GenerateResource.cache
......@@ -24,3 +23,4 @@ C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.csproj.CoreCompileInputs.cache
C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.csproj.CopyComplete
C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.exe
C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.pdb
C:\Neotel\Program\FaceControl\Test\obj\Debug\Test.csproj.AssemblyReference.cache
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!