More Ui tweaks

This commit is contained in:
2022-06-15 14:00:51 +02:00
parent bc674dad86
commit 942185c3b4
2 changed files with 39 additions and 33 deletions

View File

@@ -58,7 +58,7 @@
// //
this.pbxColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); this.pbxColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31)))));
this.pbxColor.Location = new System.Drawing.Point(13, 13); this.pbxColor.Location = new System.Drawing.Point(13, 13);
this.pbxColor.Margin = new System.Windows.Forms.Padding(4); this.pbxColor.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.pbxColor.Name = "pbxColor"; this.pbxColor.Name = "pbxColor";
this.pbxColor.Size = new System.Drawing.Size(255, 255); this.pbxColor.Size = new System.Drawing.Size(255, 255);
this.pbxColor.TabIndex = 0; this.pbxColor.TabIndex = 0;
@@ -70,9 +70,9 @@
// //
this.pbxSelectedColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); this.pbxSelectedColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31)))));
this.pbxSelectedColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.pbxSelectedColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.pbxSelectedColor.Location = new System.Drawing.Point(326, 205); this.pbxSelectedColor.Location = new System.Drawing.Point(311, 189);
this.pbxSelectedColor.Name = "pbxSelectedColor"; this.pbxSelectedColor.Name = "pbxSelectedColor";
this.pbxSelectedColor.Size = new System.Drawing.Size(100, 100); this.pbxSelectedColor.Size = new System.Drawing.Size(116, 116);
this.pbxSelectedColor.TabIndex = 4; this.pbxSelectedColor.TabIndex = 4;
this.pbxSelectedColor.TabStop = false; this.pbxSelectedColor.TabStop = false;
this.pbxSelectedColor.Click += new System.EventHandler(this.pbxSelectedColor_Click); this.pbxSelectedColor.Click += new System.EventHandler(this.pbxSelectedColor_Click);
@@ -81,16 +81,16 @@
// //
this.nupRed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.nupRed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59)))));
this.nupRed.BorderStyle = System.Windows.Forms.BorderStyle.None; this.nupRed.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.nupRed.Font = new System.Drawing.Font("Cascadia Code", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nupRed.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nupRed.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.nupRed.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.nupRed.Location = new System.Drawing.Point(348, 12); this.nupRed.Location = new System.Drawing.Point(336, 58);
this.nupRed.Maximum = new decimal(new int[] { this.nupRed.Maximum = new decimal(new int[] {
255, 255,
0, 0,
0, 0,
0}); 0});
this.nupRed.Name = "nupRed"; this.nupRed.Name = "nupRed";
this.nupRed.Size = new System.Drawing.Size(78, 27); this.nupRed.Size = new System.Drawing.Size(91, 25);
this.nupRed.TabIndex = 11; this.nupRed.TabIndex = 11;
this.nupRed.ValueChanged += new System.EventHandler(this.nupValueChanged); this.nupRed.ValueChanged += new System.EventHandler(this.nupValueChanged);
// //
@@ -98,16 +98,16 @@
// //
this.nupGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.nupGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59)))));
this.nupGreen.BorderStyle = System.Windows.Forms.BorderStyle.None; this.nupGreen.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.nupGreen.Font = new System.Drawing.Font("Cascadia Code", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nupGreen.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nupGreen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.nupGreen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.nupGreen.Location = new System.Drawing.Point(348, 46); this.nupGreen.Location = new System.Drawing.Point(336, 89);
this.nupGreen.Maximum = new decimal(new int[] { this.nupGreen.Maximum = new decimal(new int[] {
255, 255,
0, 0,
0, 0,
0}); 0});
this.nupGreen.Name = "nupGreen"; this.nupGreen.Name = "nupGreen";
this.nupGreen.Size = new System.Drawing.Size(78, 27); this.nupGreen.Size = new System.Drawing.Size(91, 25);
this.nupGreen.TabIndex = 16; this.nupGreen.TabIndex = 16;
this.nupGreen.ValueChanged += new System.EventHandler(this.nupValueChanged); this.nupGreen.ValueChanged += new System.EventHandler(this.nupValueChanged);
// //
@@ -115,16 +115,16 @@
// //
this.nupBlue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.nupBlue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59)))));
this.nupBlue.BorderStyle = System.Windows.Forms.BorderStyle.None; this.nupBlue.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.nupBlue.Font = new System.Drawing.Font("Cascadia Code", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nupBlue.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nupBlue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.nupBlue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.nupBlue.Location = new System.Drawing.Point(348, 79); this.nupBlue.Location = new System.Drawing.Point(336, 120);
this.nupBlue.Maximum = new decimal(new int[] { this.nupBlue.Maximum = new decimal(new int[] {
255, 255,
0, 0,
0, 0,
0}); 0});
this.nupBlue.Name = "nupBlue"; this.nupBlue.Name = "nupBlue";
this.nupBlue.Size = new System.Drawing.Size(78, 27); this.nupBlue.Size = new System.Drawing.Size(91, 25);
this.nupBlue.TabIndex = 17; this.nupBlue.TabIndex = 17;
this.nupBlue.ValueChanged += new System.EventHandler(this.nupValueChanged); this.nupBlue.ValueChanged += new System.EventHandler(this.nupValueChanged);
// //
@@ -132,16 +132,16 @@
// //
this.nupGamma.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.nupGamma.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59)))));
this.nupGamma.BorderStyle = System.Windows.Forms.BorderStyle.None; this.nupGamma.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.nupGamma.Font = new System.Drawing.Font("Cascadia Code", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.nupGamma.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.nupGamma.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.nupGamma.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.nupGamma.Location = new System.Drawing.Point(348, 112); this.nupGamma.Location = new System.Drawing.Point(336, 151);
this.nupGamma.Maximum = new decimal(new int[] { this.nupGamma.Maximum = new decimal(new int[] {
255, 255,
0, 0,
0, 0,
0}); 0});
this.nupGamma.Name = "nupGamma"; this.nupGamma.Name = "nupGamma";
this.nupGamma.Size = new System.Drawing.Size(78, 27); this.nupGamma.Size = new System.Drawing.Size(91, 25);
this.nupGamma.TabIndex = 18; this.nupGamma.TabIndex = 18;
this.nupGamma.ValueChanged += new System.EventHandler(this.nupValueChanged); this.nupGamma.ValueChanged += new System.EventHandler(this.nupValueChanged);
// //
@@ -149,18 +149,20 @@
// //
this.tbxColorHex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.tbxColorHex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59)))));
this.tbxColorHex.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbxColorHex.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbxColorHex.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.tbxColorHex.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.tbxColorHex.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.tbxColorHex.Location = new System.Drawing.Point(326, 155); this.tbxColorHex.Location = new System.Drawing.Point(311, 14);
this.tbxColorHex.Name = "tbxColorHex"; this.tbxColorHex.Name = "tbxColorHex";
this.tbxColorHex.Size = new System.Drawing.Size(100, 27); this.tbxColorHex.Size = new System.Drawing.Size(116, 29);
this.tbxColorHex.TabIndex = 20; this.tbxColorHex.TabIndex = 20;
this.tbxColorHex.Text = "#FFFFFF";
this.tbxColorHex.TextChanged += new System.EventHandler(this.tbxColorHex_TextChanged); this.tbxColorHex.TextChanged += new System.EventHandler(this.tbxColorHex_TextChanged);
this.tbxColorHex.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxColorHex_KeyDown); this.tbxColorHex.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbxColorHex_KeyDown);
// //
// pbxSliderRed // pbxSliderRed
// //
this.pbxSliderRed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); this.pbxSliderRed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31)))));
this.pbxSliderRed.Location = new System.Drawing.Point(12, 275); this.pbxSliderRed.Location = new System.Drawing.Point(11, 275);
this.pbxSliderRed.Name = "pbxSliderRed"; this.pbxSliderRed.Name = "pbxSliderRed";
this.pbxSliderRed.Size = new System.Drawing.Size(255, 30); this.pbxSliderRed.Size = new System.Drawing.Size(255, 30);
this.pbxSliderRed.TabIndex = 21; this.pbxSliderRed.TabIndex = 21;
@@ -182,40 +184,44 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.label1.Location = new System.Drawing.Point(322, 15); this.label1.Location = new System.Drawing.Point(308, 57);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(20, 22); this.label1.Size = new System.Drawing.Size(24, 22);
this.label1.TabIndex = 23; this.label1.TabIndex = 23;
this.label1.Text = "R"; this.label1.Text = "R";
// //
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.label2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.label2.Location = new System.Drawing.Point(322, 49); this.label2.Location = new System.Drawing.Point(307, 88);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(20, 22); this.label2.Size = new System.Drawing.Size(25, 22);
this.label2.TabIndex = 24; this.label2.TabIndex = 24;
this.label2.Text = "G"; this.label2.Text = "G";
// //
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.label3.Location = new System.Drawing.Point(322, 82); this.label3.Location = new System.Drawing.Point(307, 119);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(20, 22); this.label3.Size = new System.Drawing.Size(23, 22);
this.label3.TabIndex = 25; this.label3.TabIndex = 25;
this.label3.Text = "B"; this.label3.Text = "B";
// //
// label4 // label4
// //
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.label4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.label4.Location = new System.Drawing.Point(322, 115); this.label4.Location = new System.Drawing.Point(308, 150);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(20, 22); this.label4.Size = new System.Drawing.Size(23, 22);
this.label4.TabIndex = 26; this.label4.TabIndex = 26;
this.label4.Text = "A"; this.label4.Text = "A";
// //
@@ -231,10 +237,10 @@
// //
// ColorPicker // ColorPicker
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34))))); this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
this.ClientSize = new System.Drawing.Size(440, 316); this.ClientSize = new System.Drawing.Size(433, 314);
this.Controls.Add(this.label4); this.Controls.Add(this.label4);
this.Controls.Add(this.label3); this.Controls.Add(this.label3);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
@@ -252,7 +258,7 @@
this.Font = new System.Drawing.Font("Cascadia Code", 10.2F); this.Font = new System.Drawing.Font("Cascadia Code", 10.2F);
this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214)))));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Margin = new System.Windows.Forms.Padding(4); this.Margin = new System.Windows.Forms.Padding(5, 4, 5, 4);
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "ColorPicker"; this.Name = "ColorPicker";
this.Text = "ColorPicker"; this.Text = "ColorPicker";

View File

@@ -303,7 +303,7 @@
this.nupPencilWidth.BorderStyle = System.Windows.Forms.BorderStyle.None; this.nupPencilWidth.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.nupPencilWidth.Font = new System.Drawing.Font("Cascadia Code", 15F); this.nupPencilWidth.Font = new System.Drawing.Font("Cascadia Code", 15F);
this.nupPencilWidth.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.nupPencilWidth.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247)))));
this.nupPencilWidth.Location = new System.Drawing.Point(126, 191); this.nupPencilWidth.Location = new System.Drawing.Point(128, 198);
this.nupPencilWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nupPencilWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.nupPencilWidth.Maximum = new decimal(new int[] { this.nupPencilWidth.Maximum = new decimal(new int[] {
255, 255,
@@ -404,7 +404,7 @@
this.panelTools.Location = new System.Drawing.Point(1014, 6); this.panelTools.Location = new System.Drawing.Point(1014, 6);
this.panelTools.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panelTools.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panelTools.Name = "panelTools"; this.panelTools.Name = "panelTools";
this.panelTools.Size = new System.Drawing.Size(196, 237); this.panelTools.Size = new System.Drawing.Size(196, 232);
this.panelTools.TabIndex = 31; this.panelTools.TabIndex = 31;
// //
// btnEyeDrop // btnEyeDrop
@@ -424,7 +424,7 @@
// //
// pbxSample // pbxSample
// //
this.pbxSample.Location = new System.Drawing.Point(3, 174); this.pbxSample.Location = new System.Drawing.Point(6, 166);
this.pbxSample.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pbxSample.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.pbxSample.Name = "pbxSample"; this.pbxSample.Name = "pbxSample";
this.pbxSample.Size = new System.Drawing.Size(117, 59); this.pbxSample.Size = new System.Drawing.Size(117, 59);
@@ -540,7 +540,7 @@
this.panel3.Controls.Add(this.btnLayerRemove); this.panel3.Controls.Add(this.btnLayerRemove);
this.panel3.Controls.Add(this.BtnAddLayer); this.panel3.Controls.Add(this.BtnAddLayer);
this.panel3.Controls.Add(this.label2); this.panel3.Controls.Add(this.label2);
this.panel3.Location = new System.Drawing.Point(1014, 247); this.panel3.Location = new System.Drawing.Point(1014, 242);
this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.panel3.Name = "panel3"; this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(196, 259); this.panel3.Size = new System.Drawing.Size(196, 259);