diff --git a/Bin/SunnyUI.dll b/Bin/SunnyUI.dll index 6654138e..74a8a99c 100644 Binary files a/Bin/SunnyUI.dll and b/Bin/SunnyUI.dll differ diff --git a/Bin/SunnyUI.pdb b/Bin/SunnyUI.pdb index 71bd5a4d..e98783a0 100644 Binary files a/Bin/SunnyUI.pdb and b/Bin/SunnyUI.pdb differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe index 5df34b27..45dca6e4 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.Demo.exe and b/SunnyUI.Demo/Bin/SunnyUI.Demo.exe differ diff --git a/SunnyUI.Demo/Bin/SunnyUI.dll b/SunnyUI.Demo/Bin/SunnyUI.dll index 6654138e..74a8a99c 100644 Binary files a/SunnyUI.Demo/Bin/SunnyUI.dll and b/SunnyUI.Demo/Bin/SunnyUI.dll differ diff --git a/SunnyUI.Demo/Controls/FButton.Designer.cs b/SunnyUI.Demo/Controls/FButton.Designer.cs index 74426573..532aee5f 100644 --- a/SunnyUI.Demo/Controls/FButton.Designer.cs +++ b/SunnyUI.Demo/Controls/FButton.Designer.cs @@ -158,10 +158,12 @@ this.uiButton1.FillColor = System.Drawing.Color.White; this.uiButton1.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiButton1.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.uiButton1.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiButton1.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(96)))), ((int)(((byte)(98)))), ((int)(((byte)(102))))); this.uiButton1.ForeHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.uiButton1.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(131)))), ((int)(((byte)(229))))); + this.uiButton1.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(131)))), ((int)(((byte)(229))))); this.uiButton1.Location = new System.Drawing.Point(30, 50); this.uiButton1.Name = "uiButton1"; this.uiButton1.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(216)))), ((int)(((byte)(219)))), ((int)(((byte)(227))))); @@ -178,8 +180,10 @@ // this.uiButton2.Cursor = System.Windows.Forms.Cursors.Hand; this.uiButton2.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiButton2.ForeSelectedColor = System.Drawing.Color.Empty; this.uiButton2.Location = new System.Drawing.Point(144, 50); this.uiButton2.Name = "uiButton2"; + this.uiButton2.RectSelectedColor = System.Drawing.Color.Empty; this.uiButton2.ShowFocusLine = true; this.uiButton2.Size = new System.Drawing.Size(100, 35); this.uiButton2.StyleCustomMode = true; @@ -193,12 +197,14 @@ this.uiButton3.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiButton3.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiButton3.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiButton3.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiButton3.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton3.Location = new System.Drawing.Point(258, 50); this.uiButton3.Name = "uiButton3"; this.uiButton3.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiButton3.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiButton3.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiButton3.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiButton3.ShowFocusLine = true; this.uiButton3.Size = new System.Drawing.Size(100, 35); this.uiButton3.Style = Sunny.UI.UIStyle.Green; @@ -212,12 +218,14 @@ this.uiButton4.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiButton4.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiButton4.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiButton4.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiButton4.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton4.Location = new System.Drawing.Point(600, 50); this.uiButton4.Name = "uiButton4"; this.uiButton4.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiButton4.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiButton4.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiButton4.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiButton4.ShowFocusLine = true; this.uiButton4.Size = new System.Drawing.Size(100, 35); this.uiButton4.Style = Sunny.UI.UIStyle.Red; @@ -231,12 +239,14 @@ this.uiButton5.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiButton5.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiButton5.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiButton5.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiButton5.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton5.Location = new System.Drawing.Point(486, 50); this.uiButton5.Name = "uiButton5"; this.uiButton5.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiButton5.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiButton5.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiButton5.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiButton5.ShowFocusLine = true; this.uiButton5.Size = new System.Drawing.Size(100, 35); this.uiButton5.Style = Sunny.UI.UIStyle.Orange; @@ -250,12 +260,14 @@ this.uiButton6.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiButton6.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(160)))), ((int)(((byte)(165))))); this.uiButton6.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); + this.uiButton6.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); this.uiButton6.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton6.Location = new System.Drawing.Point(372, 50); this.uiButton6.Name = "uiButton6"; this.uiButton6.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiButton6.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(160)))), ((int)(((byte)(165))))); this.uiButton6.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); + this.uiButton6.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); this.uiButton6.ShowFocusLine = true; this.uiButton6.Size = new System.Drawing.Size(100, 35); this.uiButton6.Style = Sunny.UI.UIStyle.Gray; @@ -269,6 +281,7 @@ this.uiButton7.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(238)))), ((int)(((byte)(238))))); this.uiButton7.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiButton7.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiButton7.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiButton7.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton7.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiButton7.Location = new System.Drawing.Point(600, 100); @@ -276,6 +289,7 @@ this.uiButton7.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiButton7.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiButton7.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiButton7.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiButton7.Size = new System.Drawing.Size(100, 35); this.uiButton7.Style = Sunny.UI.UIStyle.LightRed; this.uiButton7.StyleCustomMode = true; @@ -288,6 +302,7 @@ this.uiButton8.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(245)))), ((int)(((byte)(233))))); this.uiButton8.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiButton8.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiButton8.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiButton8.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton8.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiButton8.Location = new System.Drawing.Point(486, 100); @@ -295,6 +310,7 @@ this.uiButton8.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiButton8.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiButton8.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiButton8.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiButton8.Size = new System.Drawing.Size(100, 35); this.uiButton8.Style = Sunny.UI.UIStyle.LightOrange; this.uiButton8.StyleCustomMode = true; @@ -307,6 +323,7 @@ this.uiButton9.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(242)))), ((int)(((byte)(242)))), ((int)(((byte)(244))))); this.uiButton9.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiButton9.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); + this.uiButton9.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); this.uiButton9.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiButton9.Location = new System.Drawing.Point(372, 100); @@ -314,6 +331,7 @@ this.uiButton9.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiButton9.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiButton9.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); + this.uiButton9.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); this.uiButton9.Size = new System.Drawing.Size(100, 35); this.uiButton9.Style = Sunny.UI.UIStyle.LightGray; this.uiButton9.StyleCustomMode = true; @@ -326,6 +344,7 @@ this.uiButton10.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(248)))), ((int)(((byte)(232))))); this.uiButton10.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiButton10.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiButton10.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiButton10.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton10.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiButton10.Location = new System.Drawing.Point(258, 100); @@ -333,18 +352,22 @@ this.uiButton10.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiButton10.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiButton10.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiButton10.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiButton10.Size = new System.Drawing.Size(100, 35); this.uiButton10.Style = Sunny.UI.UIStyle.LightGreen; this.uiButton10.StyleCustomMode = true; this.uiButton10.TabIndex = 8; this.uiButton10.Text = "LightGreen"; + this.uiButton10.Click += new System.EventHandler(this.uiButton10_Click); // // uiButton11 // this.uiButton11.Cursor = System.Windows.Forms.Cursors.Hand; this.uiButton11.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiButton11.ForeSelectedColor = System.Drawing.Color.Empty; this.uiButton11.Location = new System.Drawing.Point(144, 100); this.uiButton11.Name = "uiButton11"; + this.uiButton11.RectSelectedColor = System.Drawing.Color.Empty; this.uiButton11.Size = new System.Drawing.Size(100, 35); this.uiButton11.StyleCustomMode = true; this.uiButton11.TabIndex = 7; @@ -356,10 +379,12 @@ this.uiButton12.FillColor = System.Drawing.Color.White; this.uiButton12.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiButton12.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.uiButton12.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiButton12.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(96)))), ((int)(((byte)(98)))), ((int)(((byte)(102))))); this.uiButton12.ForeHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.uiButton12.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(131)))), ((int)(((byte)(229))))); + this.uiButton12.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(131)))), ((int)(((byte)(229))))); this.uiButton12.Location = new System.Drawing.Point(30, 100); this.uiButton12.Name = "uiButton12"; this.uiButton12.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(216)))), ((int)(((byte)(219)))), ((int)(((byte)(227))))); @@ -376,6 +401,7 @@ this.uiButton13.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiButton13.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiButton13.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiButton13.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiButton13.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton13.Location = new System.Drawing.Point(600, 150); this.uiButton13.Name = "uiButton13"; @@ -383,6 +409,7 @@ this.uiButton13.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiButton13.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiButton13.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiButton13.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiButton13.Size = new System.Drawing.Size(100, 35); this.uiButton13.Style = Sunny.UI.UIStyle.Red; this.uiButton13.StyleCustomMode = true; @@ -395,6 +422,7 @@ this.uiButton14.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiButton14.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiButton14.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiButton14.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiButton14.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton14.Location = new System.Drawing.Point(486, 150); this.uiButton14.Name = "uiButton14"; @@ -402,6 +430,7 @@ this.uiButton14.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiButton14.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiButton14.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiButton14.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiButton14.Size = new System.Drawing.Size(100, 35); this.uiButton14.Style = Sunny.UI.UIStyle.Orange; this.uiButton14.StyleCustomMode = true; @@ -414,6 +443,7 @@ this.uiButton15.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiButton15.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(160)))), ((int)(((byte)(165))))); this.uiButton15.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); + this.uiButton15.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); this.uiButton15.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton15.Location = new System.Drawing.Point(372, 150); this.uiButton15.Name = "uiButton15"; @@ -421,6 +451,7 @@ this.uiButton15.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(140)))), ((int)(((byte)(140)))), ((int)(((byte)(140))))); this.uiButton15.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(158)))), ((int)(((byte)(160)))), ((int)(((byte)(165))))); this.uiButton15.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); + this.uiButton15.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(121)))), ((int)(((byte)(123)))), ((int)(((byte)(129))))); this.uiButton15.Size = new System.Drawing.Size(100, 35); this.uiButton15.Style = Sunny.UI.UIStyle.Gray; this.uiButton15.StyleCustomMode = true; @@ -433,6 +464,7 @@ this.uiButton16.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiButton16.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiButton16.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiButton16.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiButton16.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiButton16.Location = new System.Drawing.Point(258, 150); this.uiButton16.Name = "uiButton16"; @@ -440,6 +472,7 @@ this.uiButton16.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiButton16.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiButton16.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiButton16.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiButton16.Size = new System.Drawing.Size(100, 35); this.uiButton16.Style = Sunny.UI.UIStyle.Green; this.uiButton16.StyleCustomMode = true; @@ -450,9 +483,11 @@ // this.uiButton17.Cursor = System.Windows.Forms.Cursors.Hand; this.uiButton17.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiButton17.ForeSelectedColor = System.Drawing.Color.Empty; this.uiButton17.Location = new System.Drawing.Point(144, 150); this.uiButton17.Name = "uiButton17"; this.uiButton17.Radius = 35; + this.uiButton17.RectSelectedColor = System.Drawing.Color.Empty; this.uiButton17.Size = new System.Drawing.Size(100, 35); this.uiButton17.StyleCustomMode = true; this.uiButton17.TabIndex = 13; @@ -497,12 +532,14 @@ this.uiSymbolButton3.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiSymbolButton3.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiSymbolButton3.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiSymbolButton3.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiSymbolButton3.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton3.Location = new System.Drawing.Point(372, 230); this.uiSymbolButton3.Name = "uiSymbolButton3"; this.uiSymbolButton3.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiSymbolButton3.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiSymbolButton3.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiSymbolButton3.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiSymbolButton3.Size = new System.Drawing.Size(100, 35); this.uiSymbolButton3.Style = Sunny.UI.UIStyle.Green; this.uiSymbolButton3.StyleCustomMode = true; @@ -514,8 +551,10 @@ // this.uiSymbolButton4.Cursor = System.Windows.Forms.Cursors.Hand; this.uiSymbolButton4.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiSymbolButton4.ForeSelectedColor = System.Drawing.Color.Empty; this.uiSymbolButton4.Location = new System.Drawing.Point(258, 230); this.uiSymbolButton4.Name = "uiSymbolButton4"; + this.uiSymbolButton4.RectSelectedColor = System.Drawing.Color.Empty; this.uiSymbolButton4.Size = new System.Drawing.Size(100, 35); this.uiSymbolButton4.StyleCustomMode = true; this.uiSymbolButton4.Symbol = 61529; @@ -528,12 +567,14 @@ this.uiSymbolButton5.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiSymbolButton5.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiSymbolButton5.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiSymbolButton5.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiSymbolButton5.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton5.Location = new System.Drawing.Point(486, 230); this.uiSymbolButton5.Name = "uiSymbolButton5"; this.uiSymbolButton5.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiSymbolButton5.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiSymbolButton5.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiSymbolButton5.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiSymbolButton5.Size = new System.Drawing.Size(100, 35); this.uiSymbolButton5.Style = Sunny.UI.UIStyle.Orange; this.uiSymbolButton5.StyleCustomMode = true; @@ -547,12 +588,14 @@ this.uiSymbolButton6.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton6.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton6.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiSymbolButton6.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton6.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton6.Location = new System.Drawing.Point(600, 230); this.uiSymbolButton6.Name = "uiSymbolButton6"; this.uiSymbolButton6.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton6.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton6.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiSymbolButton6.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton6.Size = new System.Drawing.Size(100, 35); this.uiSymbolButton6.Style = Sunny.UI.UIStyle.Red; this.uiSymbolButton6.StyleCustomMode = true; @@ -566,6 +609,7 @@ this.uiSymbolButton7.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton7.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton7.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiSymbolButton7.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton7.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton7.IsCircle = true; this.uiSymbolButton7.Location = new System.Drawing.Point(235, 280); @@ -573,6 +617,7 @@ this.uiSymbolButton7.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton7.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton7.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiSymbolButton7.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton7.Size = new System.Drawing.Size(35, 35); this.uiSymbolButton7.Style = Sunny.UI.UIStyle.Red; this.uiSymbolButton7.StyleCustomMode = true; @@ -585,6 +630,7 @@ this.uiSymbolButton8.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiSymbolButton8.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiSymbolButton8.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiSymbolButton8.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiSymbolButton8.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton8.IsCircle = true; this.uiSymbolButton8.Location = new System.Drawing.Point(194, 280); @@ -592,6 +638,7 @@ this.uiSymbolButton8.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(155)))), ((int)(((byte)(40))))); this.uiSymbolButton8.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(223)))), ((int)(((byte)(174)))), ((int)(((byte)(86))))); this.uiSymbolButton8.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); + this.uiSymbolButton8.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(137)))), ((int)(((byte)(43))))); this.uiSymbolButton8.Size = new System.Drawing.Size(35, 35); this.uiSymbolButton8.Style = Sunny.UI.UIStyle.Orange; this.uiSymbolButton8.StyleCustomMode = true; @@ -604,6 +651,7 @@ this.uiSymbolButton9.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiSymbolButton9.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiSymbolButton9.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiSymbolButton9.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiSymbolButton9.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton9.IsCircle = true; this.uiSymbolButton9.Location = new System.Drawing.Point(153, 280); @@ -611,6 +659,7 @@ this.uiSymbolButton9.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(110)))), ((int)(((byte)(190)))), ((int)(((byte)(40))))); this.uiSymbolButton9.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(136)))), ((int)(((byte)(202)))), ((int)(((byte)(81))))); this.uiSymbolButton9.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); + this.uiSymbolButton9.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(100)))), ((int)(((byte)(168)))), ((int)(((byte)(35))))); this.uiSymbolButton9.Size = new System.Drawing.Size(35, 35); this.uiSymbolButton9.Style = Sunny.UI.UIStyle.Green; this.uiSymbolButton9.StyleCustomMode = true; @@ -621,9 +670,11 @@ // this.uiSymbolButton10.Cursor = System.Windows.Forms.Cursors.Hand; this.uiSymbolButton10.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiSymbolButton10.ForeSelectedColor = System.Drawing.Color.Empty; this.uiSymbolButton10.IsCircle = true; this.uiSymbolButton10.Location = new System.Drawing.Point(112, 280); this.uiSymbolButton10.Name = "uiSymbolButton10"; + this.uiSymbolButton10.RectSelectedColor = System.Drawing.Color.Empty; this.uiSymbolButton10.Size = new System.Drawing.Size(35, 35); this.uiSymbolButton10.StyleCustomMode = true; this.uiSymbolButton10.TabIndex = 28; @@ -634,6 +685,7 @@ this.uiSymbolButton11.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton11.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton11.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiSymbolButton11.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton11.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton11.IsCircle = true; this.uiSymbolButton11.Location = new System.Drawing.Point(71, 280); @@ -641,6 +693,7 @@ this.uiSymbolButton11.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton11.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton11.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiSymbolButton11.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton11.Size = new System.Drawing.Size(35, 35); this.uiSymbolButton11.Style = Sunny.UI.UIStyle.Red; this.uiSymbolButton11.StyleCustomMode = true; @@ -654,10 +707,12 @@ this.uiSymbolButton12.FillColor = System.Drawing.Color.White; this.uiSymbolButton12.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiSymbolButton12.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); + this.uiSymbolButton12.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(243)))), ((int)(((byte)(255))))); this.uiSymbolButton12.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(96)))), ((int)(((byte)(98)))), ((int)(((byte)(102))))); this.uiSymbolButton12.ForeHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(160)))), ((int)(((byte)(255))))); this.uiSymbolButton12.ForePressColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(131)))), ((int)(((byte)(229))))); + this.uiSymbolButton12.ForeSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(74)))), ((int)(((byte)(131)))), ((int)(((byte)(229))))); this.uiSymbolButton12.IsCircle = true; this.uiSymbolButton12.Location = new System.Drawing.Point(30, 280); this.uiSymbolButton12.Name = "uiSymbolButton12"; @@ -888,8 +943,10 @@ // this.uiSymbolButton1.Cursor = System.Windows.Forms.Cursors.Hand; this.uiSymbolButton1.Font = new System.Drawing.Font("微软雅黑", 12F); + this.uiSymbolButton1.ForeSelectedColor = System.Drawing.Color.Empty; this.uiSymbolButton1.Location = new System.Drawing.Point(30, 230); this.uiSymbolButton1.Name = "uiSymbolButton1"; + this.uiSymbolButton1.RectSelectedColor = System.Drawing.Color.Empty; this.uiSymbolButton1.Size = new System.Drawing.Size(100, 35); this.uiSymbolButton1.StyleCustomMode = true; this.uiSymbolButton1.TabIndex = 20; @@ -901,12 +958,14 @@ this.uiSymbolButton2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton2.FillHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton2.FillPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiSymbolButton2.FillSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton2.Font = new System.Drawing.Font("微软雅黑", 12F); this.uiSymbolButton2.Location = new System.Drawing.Point(144, 230); this.uiSymbolButton2.Name = "uiSymbolButton2"; this.uiSymbolButton2.RectColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); this.uiSymbolButton2.RectHoverColor = System.Drawing.Color.FromArgb(((int)(((byte)(232)))), ((int)(((byte)(127)))), ((int)(((byte)(128))))); this.uiSymbolButton2.RectPressColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); + this.uiSymbolButton2.RectSelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(202)))), ((int)(((byte)(87)))), ((int)(((byte)(89))))); this.uiSymbolButton2.Size = new System.Drawing.Size(100, 35); this.uiSymbolButton2.Style = Sunny.UI.UIStyle.Red; this.uiSymbolButton2.StyleCustomMode = true; diff --git a/SunnyUI.Demo/Controls/FButton.cs b/SunnyUI.Demo/Controls/FButton.cs index 1e564ef1..a56cbf88 100644 --- a/SunnyUI.Demo/Controls/FButton.cs +++ b/SunnyUI.Demo/Controls/FButton.cs @@ -1,5 +1,4 @@ using System; -using System.Drawing; namespace Sunny.UI.Demo { @@ -8,15 +7,15 @@ namespace Sunny.UI.Demo public FButton() { InitializeComponent(); - uiToolTip1.SetToolTip(uiButton1,uiButton1.Text); - uiToolTip1.SetToolTip(uiSymbolButton1,uiSymbolButton1.Text,"SunnyUI"); + uiToolTip1.SetToolTip(uiButton1, uiButton1.Text); + uiToolTip1.SetToolTip(uiSymbolButton1, uiSymbolButton1.Text, "SunnyUI"); uiToolTip1.SetToolTip(uiSymbolButton2, uiSymbolButton2.Text, "SunnyUI", - uiSymbolButton2.Symbol, 32,UIColor.Red); + uiSymbolButton2.Symbol, 32, UIColor.Red); } - private void button1_Click(object sender, EventArgs e) + private void uiButton10_Click(object sender, EventArgs e) { - + uiButton10.Selected = !uiButton10.Selected; } } } \ No newline at end of file diff --git a/SunnyUI.Demo/Controls/FButton.resx b/SunnyUI.Demo/Controls/FButton.resx index 8018e1c6..3ea6cbca 100644 --- a/SunnyUI.Demo/Controls/FButton.resx +++ b/SunnyUI.Demo/Controls/FButton.resx @@ -120,4 +120,7 @@ 17, 17 + + 52 + \ No newline at end of file diff --git a/SunnyUI/Controls/UIButton.cs b/SunnyUI/Controls/UIButton.cs index 975bf584..a5757e88 100644 --- a/SunnyUI/Controls/UIButton.cs +++ b/SunnyUI/Controls/UIButton.cs @@ -129,6 +129,18 @@ namespace Sunny.UI } } + protected override void OnPaintFill(Graphics g, GraphicsPath path) + { + if (!selected) + { + base.OnPaintFill(g, path); + } + else + { + g.FillPath(FillSelectedColor,path); + } + } + protected override void OnPaint(PaintEventArgs e) { base.OnPaint(e); @@ -157,9 +169,7 @@ namespace Sunny.UI path.Dispose(); } } - - private bool selected; - + /// /// 是否选中 /// @@ -190,6 +200,10 @@ namespace Sunny.UI rectPressColor = uiColor.RectPressColor; forePressColor = uiColor.ButtonForePressColor; + fillSelectedColor = uiColor.ButtonFillSelectedColor; + foreSelectedColor = uiColor.ButtonForeSelectedColor; + rectSelectedColor = uiColor.RectSelectedColor; + Invalidate(); } @@ -289,11 +303,25 @@ namespace Sunny.UI set => SetRectPressColor(value); } - [DefaultValue(typeof(Color), "64, 105, 225")] - public Color SelectedColor + [DefaultValue(typeof(Color), "74, 131, 229")] + public Color FillSelectedColor { - get => selectedColor; - set => SetSelectedColor(value); + get => fillSelectedColor; + set => SetFillSelectedColor(value); + } + + [DefaultValue(typeof(Color), "White")] + public Color ForeSelectedColor + { + get => foreSelectedColor; + set => SetForeSelectedColor(value); + } + + [DefaultValue(typeof(Color), "74, 131, 229")] + public Color RectSelectedColor + { + get => rectSelectedColor; + set => SetRectSelectedColor(value); } protected override void OnMouseDown(MouseEventArgs e) diff --git a/SunnyUI/Controls/UIControl.cs b/SunnyUI/Controls/UIControl.cs index dd86a4dc..822ec798 100644 --- a/SunnyUI/Controls/UIControl.cs +++ b/SunnyUI/Controls/UIControl.cs @@ -215,7 +215,7 @@ namespace Sunny.UI rectPressColor = rectHoverColor = rectColor; forePressColor = foreHoverColor = foreColor; - selectedColor = uiColor.ButtonSelectedColor; + fillSelectedColor = uiColor.ButtonFillSelectedColor; Invalidate(); } @@ -314,6 +314,8 @@ namespace Sunny.UI color = rectHoverColor; if (IsPress) color = rectPressColor; + if (selected) + color = rectSelectedColor; return Enabled ? color : rectDisableColor; } @@ -329,6 +331,8 @@ namespace Sunny.UI color = foreHoverColor; if (IsPress) color = forePressColor; + if (selected) + color = foreSelectedColor; return Enabled ? color : foreDisableColor; } @@ -344,6 +348,8 @@ namespace Sunny.UI color = fillHoverColor; if (IsPress) color = fillPressColor; + if (selected) + color = fillSelectedColor; return Enabled ? color : fillDisableColor; } @@ -492,7 +498,7 @@ namespace Sunny.UI /// /// 选中颜色 /// - protected Color selectedColor = UIStyles.Blue.ButtonSelectedColor; + protected Color fillSelectedColor = UIStyles.Blue.ButtonFillSelectedColor; /// /// 边框颜色 @@ -558,11 +564,42 @@ namespace Sunny.UI /// 设置选中颜色 /// /// 颜色 - protected void SetSelectedColor(Color value) + protected void SetFillSelectedColor(Color value) { - if (selectedColor != value) + if (fillSelectedColor != value) { - selectedColor = value; + fillSelectedColor = value; + Invalidate(); + } + } + + protected bool selected; + protected Color foreSelectedColor; + + /// + /// 设置选中颜色 + /// + /// 颜色 + protected void SetForeSelectedColor(Color value) + { + if (foreSelectedColor != value) + { + foreSelectedColor = value; + Invalidate(); + } + } + + protected Color rectSelectedColor; + + /// + /// 设置选中颜色 + /// + /// 颜色 + protected void SetRectSelectedColor(Color value) + { + if (rectSelectedColor != value) + { + rectSelectedColor = value; Invalidate(); } } diff --git a/SunnyUI/Controls/UITransfer.Designer.cs b/SunnyUI/Controls/UITransfer.Designer.cs index 7df1df37..dca66f60 100644 --- a/SunnyUI/Controls/UITransfer.Designer.cs +++ b/SunnyUI/Controls/UITransfer.Designer.cs @@ -47,7 +47,6 @@ namespace Sunny.UI this.b1.Margin = new System.Windows.Forms.Padding(0); this.b1.Name = "b1"; this.b1.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.b1.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(158)))), ((int)(((byte)(255))))); this.b1.Size = new System.Drawing.Size(44, 32); this.b1.Symbol = 61697; this.b1.TabIndex = 3; @@ -63,7 +62,6 @@ namespace Sunny.UI this.b2.Margin = new System.Windows.Forms.Padding(0); this.b2.Name = "b2"; this.b2.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.b2.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(158)))), ((int)(((byte)(255))))); this.b2.Size = new System.Drawing.Size(44, 32); this.b2.Symbol = 61701; this.b2.TabIndex = 4; @@ -79,7 +77,6 @@ namespace Sunny.UI this.b3.Margin = new System.Windows.Forms.Padding(0); this.b3.Name = "b3"; this.b3.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.b3.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(158)))), ((int)(((byte)(255))))); this.b3.Size = new System.Drawing.Size(44, 32); this.b3.Symbol = 61700; this.b3.TabIndex = 5; @@ -95,7 +92,6 @@ namespace Sunny.UI this.b4.Margin = new System.Windows.Forms.Padding(0); this.b4.Name = "b4"; this.b4.Padding = new System.Windows.Forms.Padding(28, 0, 0, 0); - this.b4.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(158)))), ((int)(((byte)(255))))); this.b4.Size = new System.Drawing.Size(44, 32); this.b4.Symbol = 61696; this.b4.TabIndex = 6; diff --git a/SunnyUI/Style/UIStyleColor.cs b/SunnyUI/Style/UIStyleColor.cs index efc2b28e..ca4fb482 100644 --- a/SunnyUI/Style/UIStyleColor.cs +++ b/SunnyUI/Style/UIStyleColor.cs @@ -23,7 +23,7 @@ using System.Drawing; #pragma warning disable 1591 -//ButtonSelectedColor +//ButtonFillSelectedColor namespace Sunny.UI { @@ -40,6 +40,10 @@ namespace Sunny.UI public abstract Color RectHoverColor { get; } public abstract Color RectPressColor { get; } + public abstract Color RectSelectedColor { get; } + public abstract Color ButtonForeSelectedColor { get; } + public abstract Color ButtonFillSelectedColor { get; } + public abstract Color ButtonFillColor { get; } public abstract Color ButtonFillHoverColor { get; } public abstract Color ButtonFillPressColor { get; } @@ -47,7 +51,6 @@ namespace Sunny.UI public abstract Color ButtonForeColor { get; } public abstract Color ButtonForeHoverColor { get; } public abstract Color ButtonForePressColor { get; } - public abstract Color ButtonSelectedColor { get; } public virtual Color FillDisableColor => Color.FromArgb(244, 244, 244); public virtual Color RectDisableColor => Color.FromArgb(173, 178, 181); @@ -144,12 +147,14 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.FromArgb(30, 57, 91); public override Color ButtonForeHoverColor => Color.FromArgb(30, 57, 91); public override Color ButtonForePressColor => Color.FromArgb(30, 57, 91); - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); public override Color RectColor => Color.FromArgb(180, 192, 211); public override Color RectHoverColor => Color.FromArgb(238, 201, 88); public override Color RectPressColor => Color.FromArgb(194, 118, 43); public override Color TitleColor => Color.FromArgb(191, 210, 233); public override Color TitleForeColor => Color.FromArgb(30, 57, 91); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; } public class UIOffice2010SilverStyle : UIBaseStyle @@ -165,7 +170,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.FromArgb(46, 46, 46); public override Color ButtonForeHoverColor => Color.FromArgb(46, 46, 46); public override Color ButtonForePressColor => Color.FromArgb(46, 46, 46); - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => Color.FromArgb(139, 144, 151); public override Color RectHoverColor => Color.FromArgb(238, 201, 88); public override Color RectPressColor => Color.FromArgb(194, 118, 43); @@ -186,7 +193,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.Black; public override Color ButtonForeHoverColor => Color.FromArgb(70, 70, 70); public override Color ButtonForePressColor => Color.FromArgb(70, 70, 70); - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => Color.FromArgb(145, 145, 145); public override Color RectHoverColor => Color.FromArgb(238, 201, 88); public override Color RectPressColor => Color.FromArgb(194, 118, 43); @@ -208,7 +217,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.White; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Blue; public override Color RectHoverColor => Color.FromArgb(111, 168, 255); public override Color RectPressColor => Color.FromArgb(74, 131, 229); @@ -229,7 +240,9 @@ namespace Sunny.UI public override Color ButtonForeColor => UIColor.Blue; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Blue; public override Color RectHoverColor => UIColor.Blue; public override Color RectPressColor => Color.FromArgb(74, 131, 229); @@ -250,7 +263,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.White; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Green; public override Color RectHoverColor => Color.FromArgb(136, 202, 81); public override Color RectPressColor => Color.FromArgb(100, 168, 35); @@ -273,7 +288,9 @@ namespace Sunny.UI public override Color ButtonForeColor => UIColor.Green; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Green; public override Color RectHoverColor => UIColor.Green; public override Color RectPressColor => Color.FromArgb(100, 168, 35); @@ -296,7 +313,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.White; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Red; public override Color RectHoverColor => Color.FromArgb(232, 127, 128); public override Color RectPressColor => Color.FromArgb(202, 87, 89); @@ -319,7 +338,9 @@ namespace Sunny.UI public override Color ButtonForeColor => UIColor.Red; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Red; public override Color RectHoverColor => UIColor.Red; public override Color RectPressColor => Color.FromArgb(202, 87, 89); @@ -342,7 +363,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.White; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Orange; public override Color RectHoverColor => Color.FromArgb(223, 174, 86); public override Color RectPressColor => Color.FromArgb(192, 137, 43); @@ -364,7 +387,9 @@ namespace Sunny.UI public override Color ButtonFillPressColor => Color.FromArgb(192, 137, 43); public override Color ButtonForeColor => UIColor.Orange; public override Color ButtonForeHoverColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color ButtonForePressColor => Color.White; public override Color RectColor => UIColor.Orange; public override Color RectHoverColor => UIColor.Orange; @@ -388,7 +413,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.White; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Gray; public override Color RectHoverColor => Color.FromArgb(158, 160, 165); public override Color RectPressColor => Color.FromArgb(121, 123, 129); @@ -410,7 +437,9 @@ namespace Sunny.UI public override Color ButtonForeColor => UIColor.Gray; public override Color ButtonForeHoverColor => Color.White; public override Color ButtonForePressColor => Color.White; - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => UIColor.Gray; public override Color RectHoverColor => UIColor.Gray; public override Color RectPressColor => Color.FromArgb(121, 123, 129); @@ -432,7 +461,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.FromArgb(0x60, 0x62, 0x66); public override Color ButtonForeHoverColor => UIColor.Blue; public override Color ButtonForePressColor => Color.FromArgb(74, 131, 229); - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => Color.FromArgb(216, 219, 227); public override Color RectHoverColor => Color.FromArgb(197, 222, 255); public override Color RectPressColor => Color.FromArgb(74, 131, 229); @@ -454,7 +485,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.FromArgb(130, 130, 130); public override Color ButtonForeHoverColor => Color.FromArgb(130, 130, 130); public override Color ButtonForePressColor => Color.FromArgb(130, 130, 130); - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => Color.FromArgb(130, 130, 130); public override Color RectHoverColor => Color.FromArgb(130, 130, 130); public override Color RectPressColor => Color.FromArgb(130, 130, 130); @@ -475,7 +508,9 @@ namespace Sunny.UI public override Color ButtonForeColor => Color.White; public override Color ButtonForeHoverColor => Color.FromArgb(130, 130, 130); public override Color ButtonForePressColor => Color.FromArgb(130, 130, 130); - public override Color ButtonSelectedColor => Color.FromArgb(64, 105, 225); + public override Color RectSelectedColor => RectPressColor; + public override Color ButtonForeSelectedColor => ButtonForePressColor; + public override Color ButtonFillSelectedColor => ButtonFillPressColor; public override Color RectColor => Color.FromArgb(130, 130, 130); public override Color RectHoverColor => Color.FromArgb(130, 130, 130); public override Color RectPressColor => Color.FromArgb(130, 130, 130);