diff --git a/Paint_2/Form1.Designer.cs b/Paint_2/Form1.Designer.cs index 4f53cbb..15d9a3d 100644 --- a/Paint_2/Form1.Designer.cs +++ b/Paint_2/Form1.Designer.cs @@ -51,7 +51,6 @@ this.btnColorHistory4 = new System.Windows.Forms.Button(); this.btnColorHistory3 = new System.Windows.Forms.Button(); this.btnColorHistory2 = new System.Windows.Forms.Button(); - this.label4 = new System.Windows.Forms.Label(); this.btnColorHistory1 = new System.Windows.Forms.Button(); this.btnClear = new System.Windows.Forms.Button(); this.panelTools = new System.Windows.Forms.Panel(); @@ -63,16 +62,15 @@ this.btnUndo = new System.Windows.Forms.Button(); this.lsbTools = new System.Windows.Forms.ListBox(); this.panel1 = new System.Windows.Forms.Panel(); - this.panel2 = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); - this.button2 = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); this.pnlLayers = new System.Windows.Forms.Panel(); this.btnLayerRemove = new System.Windows.Forms.Button(); this.BtnAddLayer = new System.Windows.Forms.Button(); this.label2 = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); this.DebugLabel = new System.Windows.Forms.Label(); + this.panel4 = new System.Windows.Forms.Panel(); + this.label3 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.canvas)).BeginInit(); this.panelFile.SuspendLayout(); this.panelDrawing.SuspendLayout(); @@ -82,8 +80,8 @@ this.panelTools.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbxSample)).BeginInit(); this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // // tbxProjectName @@ -92,10 +90,10 @@ this.tbxProjectName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbxProjectName.Font = new System.Drawing.Font("Verdana", 15F); this.tbxProjectName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.tbxProjectName.Location = new System.Drawing.Point(11, 3); - this.tbxProjectName.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.tbxProjectName.Location = new System.Drawing.Point(2, 3); + this.tbxProjectName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.tbxProjectName.Name = "tbxProjectName"; - this.tbxProjectName.Size = new System.Drawing.Size(253, 38); + this.tbxProjectName.Size = new System.Drawing.Size(225, 32); this.tbxProjectName.TabIndex = 0; this.tbxProjectName.Text = "Untitled Project"; // @@ -104,10 +102,10 @@ this.btnSave.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnSave.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnSave.Location = new System.Drawing.Point(268, 3); - this.btnSave.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.btnSave.Location = new System.Drawing.Point(231, 2); + this.btnSave.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnSave.Name = "btnSave"; - this.btnSave.Size = new System.Drawing.Size(82, 39); + this.btnSave.Size = new System.Drawing.Size(54, 33); this.btnSave.TabIndex = 1; this.btnSave.Text = "Save"; this.btnSave.UseVisualStyleBackColor = false; @@ -117,10 +115,10 @@ // this.canvas.BackColor = System.Drawing.Color.Transparent; this.canvas.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.canvas.Location = new System.Drawing.Point(11, 59); - this.canvas.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.canvas.Location = new System.Drawing.Point(10, 49); + this.canvas.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.canvas.Name = "canvas"; - this.canvas.Size = new System.Drawing.Size(900, 500); + this.canvas.Size = new System.Drawing.Size(1000, 500); this.canvas.TabIndex = 2; this.canvas.TabStop = false; this.canvas.MouseDown += new System.Windows.Forms.MouseEventHandler(this.canvas_MouseDown); @@ -131,10 +129,10 @@ this.btnSaveCopy.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.btnSaveCopy.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnSaveCopy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnSaveCopy.Location = new System.Drawing.Point(354, 3); - this.btnSaveCopy.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.btnSaveCopy.Location = new System.Drawing.Point(289, 2); + this.btnSaveCopy.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnSaveCopy.Name = "btnSaveCopy"; - this.btnSaveCopy.Size = new System.Drawing.Size(135, 39); + this.btnSaveCopy.Size = new System.Drawing.Size(92, 33); this.btnSaveCopy.TabIndex = 2; this.btnSaveCopy.Text = "Save a copy"; this.btnSaveCopy.UseVisualStyleBackColor = false; @@ -144,9 +142,9 @@ // this.lblSelectedColor.AutoSize = true; this.lblSelectedColor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.lblSelectedColor.Location = new System.Drawing.Point(7, 28); + this.lblSelectedColor.Location = new System.Drawing.Point(6, 23); this.lblSelectedColor.Name = "lblSelectedColor"; - this.lblSelectedColor.Size = new System.Drawing.Size(288, 20); + this.lblSelectedColor.Size = new System.Drawing.Size(202, 14); this.lblSelectedColor.TabIndex = 1; this.lblSelectedColor.Text = "Hex:FFFFFF R:255 G:255 B:255"; // @@ -158,9 +156,10 @@ this.panelFile.Controls.Add(this.tbxProjectName); this.panelFile.Controls.Add(this.btnSave); this.panelFile.Controls.Add(this.btnSaveCopy); - this.panelFile.Location = new System.Drawing.Point(12, 6); + this.panelFile.Location = new System.Drawing.Point(10, 6); + this.panelFile.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panelFile.Name = "panelFile"; - this.panelFile.Size = new System.Drawing.Size(644, 47); + this.panelFile.Size = new System.Drawing.Size(487, 39); this.panelFile.TabIndex = 8; // // btnLoadFile @@ -168,10 +167,10 @@ this.btnLoadFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.btnLoadFile.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnLoadFile.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnLoadFile.Location = new System.Drawing.Point(493, 3); - this.btnLoadFile.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.btnLoadFile.Location = new System.Drawing.Point(385, 2); + this.btnLoadFile.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.btnLoadFile.Name = "btnLoadFile"; - this.btnLoadFile.Size = new System.Drawing.Size(143, 39); + this.btnLoadFile.Size = new System.Drawing.Size(96, 33); this.btnLoadFile.TabIndex = 3; this.btnLoadFile.Text = "Load Project"; this.btnLoadFile.UseVisualStyleBackColor = false; @@ -183,18 +182,19 @@ this.panelDrawing.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panelDrawing.Controls.Add(this.lblHeight); this.panelDrawing.Controls.Add(this.lblWidth); - this.panelDrawing.Location = new System.Drawing.Point(829, 575); + this.panelDrawing.Location = new System.Drawing.Point(737, 553); + this.panelDrawing.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panelDrawing.Name = "panelDrawing"; - this.panelDrawing.Size = new System.Drawing.Size(82, 72); + this.panelDrawing.Size = new System.Drawing.Size(89, 60); this.panelDrawing.TabIndex = 30; // // lblHeight // this.lblHeight.AutoSize = true; this.lblHeight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.lblHeight.Location = new System.Drawing.Point(3, 40); + this.lblHeight.Location = new System.Drawing.Point(3, 33); this.lblHeight.Name = "lblHeight"; - this.lblHeight.Size = new System.Drawing.Size(74, 20); + this.lblHeight.Size = new System.Drawing.Size(53, 14); this.lblHeight.TabIndex = 34; this.lblHeight.Text = "H:2000"; // @@ -202,9 +202,9 @@ // this.lblWidth.AutoSize = true; this.lblWidth.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.lblWidth.Location = new System.Drawing.Point(3, 8); + this.lblWidth.Location = new System.Drawing.Point(3, 7); this.lblWidth.Name = "lblWidth"; - this.lblWidth.Size = new System.Drawing.Size(77, 20); + this.lblWidth.Size = new System.Drawing.Size(57, 14); this.lblWidth.TabIndex = 33; this.lblWidth.Text = "W:2000"; // @@ -216,9 +216,10 @@ this.panelSelectedColor.Controls.Add(this.btnSelectedColor); this.panelSelectedColor.Controls.Add(this.lblSelectedColor); this.panelSelectedColor.Controls.Add(this.label14); - this.panelSelectedColor.Location = new System.Drawing.Point(424, 575); + this.panelSelectedColor.Location = new System.Drawing.Point(377, 553); + this.panelSelectedColor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panelSelectedColor.Name = "panelSelectedColor"; - this.panelSelectedColor.Size = new System.Drawing.Size(399, 72); + this.panelSelectedColor.Size = new System.Drawing.Size(355, 60); this.panelSelectedColor.TabIndex = 31; // // btnSelectedColor @@ -226,9 +227,10 @@ this.btnSelectedColor.BackColor = System.Drawing.Color.Green; this.btnSelectedColor.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnSelectedColor.Font = new System.Drawing.Font("Cascadia Code", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnSelectedColor.Location = new System.Drawing.Point(327, 6); + this.btnSelectedColor.Location = new System.Drawing.Point(291, 5); + this.btnSelectedColor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnSelectedColor.Name = "btnSelectedColor"; - this.btnSelectedColor.Size = new System.Drawing.Size(60, 60); + this.btnSelectedColor.Size = new System.Drawing.Size(53, 49); this.btnSelectedColor.TabIndex = 31; this.btnSelectedColor.UseVisualStyleBackColor = false; // @@ -237,9 +239,9 @@ this.label14.AutoSize = true; this.label14.Font = new System.Drawing.Font("Cascadia Code", 10F); this.label14.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.label14.Location = new System.Drawing.Point(7, 6); + this.label14.Location = new System.Drawing.Point(6, 5); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(150, 22); + this.label14.Size = new System.Drawing.Size(120, 18); this.label14.TabIndex = 29; this.label14.Text = "Selected color"; // @@ -251,9 +253,10 @@ this.panelHoverColor.Controls.Add(this.btnHoveringColor); this.panelHoverColor.Controls.Add(this.lblHoveringColor); this.panelHoverColor.Controls.Add(this.label15); - this.panelHoverColor.Location = new System.Drawing.Point(11, 575); + this.panelHoverColor.Location = new System.Drawing.Point(10, 553); + this.panelHoverColor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panelHoverColor.Name = "panelHoverColor"; - this.panelHoverColor.Size = new System.Drawing.Size(407, 72); + this.panelHoverColor.Size = new System.Drawing.Size(362, 60); this.panelHoverColor.TabIndex = 32; // // btnHoveringColor @@ -261,9 +264,10 @@ this.btnHoveringColor.BackColor = System.Drawing.Color.Green; this.btnHoveringColor.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnHoveringColor.Font = new System.Drawing.Font("Cascadia Code", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.btnHoveringColor.Location = new System.Drawing.Point(335, 6); + this.btnHoveringColor.Location = new System.Drawing.Point(298, 5); + this.btnHoveringColor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnHoveringColor.Name = "btnHoveringColor"; - this.btnHoveringColor.Size = new System.Drawing.Size(60, 60); + this.btnHoveringColor.Size = new System.Drawing.Size(53, 49); this.btnHoveringColor.TabIndex = 30; this.btnHoveringColor.UseVisualStyleBackColor = false; // @@ -271,9 +275,9 @@ // this.lblHoveringColor.AutoSize = true; this.lblHoveringColor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.lblHoveringColor.Location = new System.Drawing.Point(8, 28); + this.lblHoveringColor.Location = new System.Drawing.Point(7, 23); this.lblHoveringColor.Name = "lblHoveringColor"; - this.lblHoveringColor.Size = new System.Drawing.Size(288, 20); + this.lblHoveringColor.Size = new System.Drawing.Size(202, 14); this.lblHoveringColor.TabIndex = 1; this.lblHoveringColor.Text = "Hex:FFFFFF R:255 G:255 B:255"; // @@ -282,9 +286,9 @@ this.label15.AutoSize = true; this.label15.Font = new System.Drawing.Font("Cascadia Code", 10F); this.label15.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.label15.Location = new System.Drawing.Point(8, 6); + this.label15.Location = new System.Drawing.Point(7, 5); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(150, 22); + this.label15.Size = new System.Drawing.Size(120, 18); this.label15.TabIndex = 29; this.label15.Text = "Hovering color"; // @@ -299,14 +303,15 @@ this.nupPencilWidth.BorderStyle = System.Windows.Forms.BorderStyle.None; 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.Location = new System.Drawing.Point(118, 152); + this.nupPencilWidth.Location = new System.Drawing.Point(126, 191); + this.nupPencilWidth.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.nupPencilWidth.Maximum = new decimal(new int[] { 255, 0, 0, 0}); this.nupPencilWidth.Name = "nupPencilWidth"; - this.nupPencilWidth.Size = new System.Drawing.Size(71, 33); + this.nupPencilWidth.Size = new System.Drawing.Size(63, 27); this.nupPencilWidth.TabIndex = 17; this.nupPencilWidth.Value = new decimal(new int[] { 10, @@ -321,9 +326,10 @@ this.btnColorHistory4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnColorHistory4.Font = new System.Drawing.Font("Cascadia Code", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnColorHistory4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnColorHistory4.Location = new System.Drawing.Point(148, 26); + this.btnColorHistory4.Location = new System.Drawing.Point(3, 2); + this.btnColorHistory4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnColorHistory4.Name = "btnColorHistory4"; - this.btnColorHistory4.Size = new System.Drawing.Size(40, 40); + this.btnColorHistory4.Size = new System.Drawing.Size(36, 33); this.btnColorHistory4.TabIndex = 4; this.btnColorHistory4.UseVisualStyleBackColor = false; this.btnColorHistory4.Click += new System.EventHandler(this.BtnColor_Click); @@ -334,9 +340,10 @@ this.btnColorHistory3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnColorHistory3.Font = new System.Drawing.Font("Cascadia Code", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnColorHistory3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnColorHistory3.Location = new System.Drawing.Point(102, 26); + this.btnColorHistory3.Location = new System.Drawing.Point(45, 2); + this.btnColorHistory3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnColorHistory3.Name = "btnColorHistory3"; - this.btnColorHistory3.Size = new System.Drawing.Size(40, 40); + this.btnColorHistory3.Size = new System.Drawing.Size(36, 33); this.btnColorHistory3.TabIndex = 3; this.btnColorHistory3.UseVisualStyleBackColor = false; this.btnColorHistory3.Click += new System.EventHandler(this.BtnColor_Click); @@ -347,33 +354,24 @@ this.btnColorHistory2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnColorHistory2.Font = new System.Drawing.Font("Cascadia Code", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnColorHistory2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnColorHistory2.Location = new System.Drawing.Point(56, 26); + this.btnColorHistory2.Location = new System.Drawing.Point(87, 2); + this.btnColorHistory2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnColorHistory2.Name = "btnColorHistory2"; - this.btnColorHistory2.Size = new System.Drawing.Size(40, 40); + this.btnColorHistory2.Size = new System.Drawing.Size(36, 33); this.btnColorHistory2.TabIndex = 2; this.btnColorHistory2.UseVisualStyleBackColor = false; this.btnColorHistory2.Click += new System.EventHandler(this.BtnColor_Click); // - // label4 - // - this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Cascadia Code", 9F, 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.Location = new System.Drawing.Point(7, 3); - this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(135, 20); - this.label4.TabIndex = 1; - this.label4.Text = "Colors history"; - // // btnColorHistory1 // this.btnColorHistory1.BackColor = System.Drawing.Color.Green; this.btnColorHistory1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnColorHistory1.Font = new System.Drawing.Font("Cascadia Code", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnColorHistory1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnColorHistory1.Location = new System.Drawing.Point(10, 26); + this.btnColorHistory1.Location = new System.Drawing.Point(129, 2); + this.btnColorHistory1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnColorHistory1.Name = "btnColorHistory1"; - this.btnColorHistory1.Size = new System.Drawing.Size(40, 40); + this.btnColorHistory1.Size = new System.Drawing.Size(36, 33); this.btnColorHistory1.TabIndex = 0; this.btnColorHistory1.UseVisualStyleBackColor = false; this.btnColorHistory1.Click += new System.EventHandler(this.BtnColor_Click); @@ -385,9 +383,10 @@ this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnClear.Font = new System.Drawing.Font("Cascadia Code", 10.2F); this.btnClear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnClear.Location = new System.Drawing.Point(4, 38); + this.btnClear.Location = new System.Drawing.Point(4, 31); + this.btnClear.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnClear.Name = "btnClear"; - this.btnClear.Size = new System.Drawing.Size(190, 29); + this.btnClear.Size = new System.Drawing.Size(169, 24); this.btnClear.TabIndex = 27; this.btnClear.Text = "Clear"; this.btnClear.UseVisualStyleBackColor = false; @@ -398,18 +397,14 @@ this.panelTools.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.panelTools.BackColor = System.Drawing.Color.Transparent; this.panelTools.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panelTools.Controls.Add(this.btnEyeDrop); - this.panelTools.Controls.Add(this.pbxSample); - this.panelTools.Controls.Add(this.btnRandomColor); - this.panelTools.Controls.Add(this.btnColorHistory1); - this.panelTools.Controls.Add(this.label4); - this.panelTools.Controls.Add(this.btnColorHistory2); - this.panelTools.Controls.Add(this.btnColorHistory3); - this.panelTools.Controls.Add(this.btnColorHistory4); this.panelTools.Controls.Add(this.nupPencilWidth); - this.panelTools.Location = new System.Drawing.Point(920, 6); + this.panelTools.Controls.Add(this.lsbTools); + this.panelTools.Controls.Add(this.pbxSample); + this.panelTools.Controls.Add(this.label1); + this.panelTools.Location = new System.Drawing.Point(1014, 6); + this.panelTools.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panelTools.Name = "panelTools"; - this.panelTools.Size = new System.Drawing.Size(200, 193); + this.panelTools.Size = new System.Drawing.Size(196, 237); this.panelTools.TabIndex = 31; // // btnEyeDrop @@ -418,9 +413,10 @@ this.btnEyeDrop.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnEyeDrop.Font = new System.Drawing.Font("Cascadia Code", 10.2F); this.btnEyeDrop.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnEyeDrop.Location = new System.Drawing.Point(11, 74); + this.btnEyeDrop.Location = new System.Drawing.Point(283, 2); + this.btnEyeDrop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnEyeDrop.Name = "btnEyeDrop"; - this.btnEyeDrop.Size = new System.Drawing.Size(178, 33); + this.btnEyeDrop.Size = new System.Drawing.Size(104, 33); this.btnEyeDrop.TabIndex = 36; this.btnEyeDrop.Text = "EyeDropper"; this.btnEyeDrop.UseVisualStyleBackColor = false; @@ -428,9 +424,10 @@ // // pbxSample // - this.pbxSample.Location = new System.Drawing.Point(10, 152); + this.pbxSample.Location = new System.Drawing.Point(3, 174); + this.pbxSample.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pbxSample.Name = "pbxSample"; - this.pbxSample.Size = new System.Drawing.Size(101, 27); + this.pbxSample.Size = new System.Drawing.Size(117, 59); this.pbxSample.TabIndex = 35; this.pbxSample.TabStop = false; // @@ -440,9 +437,10 @@ this.btnRandomColor.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnRandomColor.Font = new System.Drawing.Font("Cascadia Code", 10.2F); this.btnRandomColor.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnRandomColor.Location = new System.Drawing.Point(11, 113); + this.btnRandomColor.Location = new System.Drawing.Point(393, 2); + this.btnRandomColor.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRandomColor.Name = "btnRandomColor"; - this.btnRandomColor.Size = new System.Drawing.Size(178, 33); + this.btnRandomColor.Size = new System.Drawing.Size(108, 33); this.btnRandomColor.TabIndex = 34; this.btnRandomColor.Text = "Random "; this.btnRandomColor.UseVisualStyleBackColor = false; @@ -454,9 +452,10 @@ this.btnColorPicker.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnColorPicker.Font = new System.Drawing.Font("Cascadia Code", 10.2F); this.btnColorPicker.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnColorPicker.Location = new System.Drawing.Point(733, 12); + this.btnColorPicker.Location = new System.Drawing.Point(171, 2); + this.btnColorPicker.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnColorPicker.Name = "btnColorPicker"; - this.btnColorPicker.Size = new System.Drawing.Size(177, 35); + this.btnColorPicker.Size = new System.Drawing.Size(106, 33); this.btnColorPicker.TabIndex = 33; this.btnColorPicker.Text = "ColorPicker"; this.btnColorPicker.UseVisualStyleBackColor = false; @@ -468,9 +467,10 @@ this.btnRedo.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnRedo.Font = new System.Drawing.Font("Cascadia Code", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnRedo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnRedo.Location = new System.Drawing.Point(3, 6); + this.btnRedo.Location = new System.Drawing.Point(3, 5); + this.btnRedo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnRedo.Name = "btnRedo"; - this.btnRedo.Size = new System.Drawing.Size(90, 28); + this.btnRedo.Size = new System.Drawing.Size(80, 23); this.btnRedo.TabIndex = 36; this.btnRedo.Text = "Redo"; this.btnRedo.UseVisualStyleBackColor = false; @@ -482,9 +482,10 @@ this.btnUndo.FlatStyle = System.Windows.Forms.FlatStyle.Popup; this.btnUndo.Font = new System.Drawing.Font("Cascadia Code", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnUndo.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnUndo.Location = new System.Drawing.Point(104, 6); + this.btnUndo.Location = new System.Drawing.Point(92, 5); + this.btnUndo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnUndo.Name = "btnUndo"; - this.btnUndo.Size = new System.Drawing.Size(90, 28); + this.btnUndo.Size = new System.Drawing.Size(80, 23); this.btnUndo.TabIndex = 35; this.btnUndo.Text = "Undo"; this.btnUndo.UseVisualStyleBackColor = false; @@ -496,96 +497,75 @@ this.lsbTools.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.lsbTools.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.lsbTools.FormattingEnabled = true; - this.lsbTools.ItemHeight = 20; - this.lsbTools.Location = new System.Drawing.Point(10, 33); + this.lsbTools.ItemHeight = 14; + this.lsbTools.Location = new System.Drawing.Point(6, 20); + this.lsbTools.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.lsbTools.Name = "lsbTools"; - this.lsbTools.Size = new System.Drawing.Size(179, 102); + this.lsbTools.Size = new System.Drawing.Size(183, 142); this.lsbTools.TabIndex = 32; this.lsbTools.SelectedIndexChanged += new System.EventHandler(this.lsbTools_SelectedIndexChanged); // // panel1 // - this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.panel1.BackColor = System.Drawing.Color.Transparent; this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panel1.Controls.Add(this.btnClear); this.panel1.Controls.Add(this.btnRedo); this.panel1.Controls.Add(this.btnUndo); - this.panel1.Location = new System.Drawing.Point(920, 575); + this.panel1.Location = new System.Drawing.Point(832, 553); + this.panel1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(200, 72); + this.panel1.Size = new System.Drawing.Size(178, 60); this.panel1.TabIndex = 35; // - // panel2 - // - this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panel2.BackColor = System.Drawing.Color.Transparent; - this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.panel2.Controls.Add(this.label1); - this.panel2.Controls.Add(this.button2); - this.panel2.Controls.Add(this.lsbTools); - this.panel2.Location = new System.Drawing.Point(920, 205); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(200, 175); - this.panel2.TabIndex = 36; - // // label1 // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Cascadia Code", 9F, 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.Location = new System.Drawing.Point(8, 10); + this.label1.Location = new System.Drawing.Point(3, 2); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(108, 20); + this.label1.Size = new System.Drawing.Size(84, 16); this.label1.TabIndex = 36; this.label1.Text = "Paint tools"; // - // button2 - // - this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); - this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button2.Font = new System.Drawing.Font("Cascadia Code", 10.2F); - this.button2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.button2.Location = new System.Drawing.Point(9, -195); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(177, 35); - this.button2.TabIndex = 33; - this.button2.Text = "ColorPicker"; - this.button2.UseVisualStyleBackColor = false; - // // panel3 // this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.panel3.BackColor = System.Drawing.Color.Transparent; this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel3.Controls.Add(this.label3); this.panel3.Controls.Add(this.pnlLayers); this.panel3.Controls.Add(this.btnLayerRemove); this.panel3.Controls.Add(this.BtnAddLayer); this.panel3.Controls.Add(this.label2); - this.panel3.Controls.Add(this.button1); - this.panel3.Location = new System.Drawing.Point(920, 384); + this.panel3.Location = new System.Drawing.Point(1014, 247); + this.panel3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(200, 175); + this.panel3.Size = new System.Drawing.Size(196, 259); this.panel3.TabIndex = 37; // // pnlLayers // this.pnlLayers.AutoScroll = true; - this.pnlLayers.Location = new System.Drawing.Point(10, 10); + this.pnlLayers.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pnlLayers.Location = new System.Drawing.Point(5, 26); + this.pnlLayers.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.pnlLayers.Name = "pnlLayers"; - this.pnlLayers.Size = new System.Drawing.Size(178, 121); + this.pnlLayers.Size = new System.Drawing.Size(184, 189); this.pnlLayers.TabIndex = 39; // // btnLayerRemove // this.btnLayerRemove.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.btnLayerRemove.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.btnLayerRemove.Font = new System.Drawing.Font("Cascadia Code", 10.2F); + this.btnLayerRemove.Font = new System.Drawing.Font("Cascadia Code", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnLayerRemove.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.btnLayerRemove.Location = new System.Drawing.Point(101, 137); + this.btnLayerRemove.Location = new System.Drawing.Point(111, 219); + this.btnLayerRemove.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.btnLayerRemove.Name = "btnLayerRemove"; - this.btnLayerRemove.Size = new System.Drawing.Size(88, 33); + this.btnLayerRemove.Size = new System.Drawing.Size(78, 35); this.btnLayerRemove.TabIndex = 38; this.btnLayerRemove.Text = "-"; this.btnLayerRemove.UseVisualStyleBackColor = false; @@ -595,11 +575,12 @@ // this.BtnAddLayer.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.BtnAddLayer.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.BtnAddLayer.Font = new System.Drawing.Font("Cascadia Code", 10.2F); + this.BtnAddLayer.Font = new System.Drawing.Font("Cascadia Code", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.BtnAddLayer.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); - this.BtnAddLayer.Location = new System.Drawing.Point(10, 137); + this.BtnAddLayer.Location = new System.Drawing.Point(3, 219); + this.BtnAddLayer.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); this.BtnAddLayer.Name = "BtnAddLayer"; - this.BtnAddLayer.Size = new System.Drawing.Size(88, 33); + this.BtnAddLayer.Size = new System.Drawing.Size(78, 35); this.BtnAddLayer.TabIndex = 37; this.BtnAddLayer.Text = "+"; this.BtnAddLayer.UseVisualStyleBackColor = false; @@ -609,44 +590,57 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Cascadia Code", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label2.Location = new System.Drawing.Point(8, 10); + this.label2.Location = new System.Drawing.Point(7, 8); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(0, 20); + this.label2.Size = new System.Drawing.Size(0, 16); this.label2.TabIndex = 36; // - // button1 - // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.button1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); - this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.button1.Font = new System.Drawing.Font("Cascadia Code", 10.2F); - this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.button1.Location = new System.Drawing.Point(9, -195); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(177, 35); - this.button1.TabIndex = 33; - this.button1.Text = "ColorPicker"; - this.button1.UseVisualStyleBackColor = false; - // // DebugLabel // this.DebugLabel.AutoSize = true; - this.DebugLabel.Location = new System.Drawing.Point(12, 555); + this.DebugLabel.Location = new System.Drawing.Point(18, 86); this.DebugLabel.Name = "DebugLabel"; - this.DebugLabel.Size = new System.Drawing.Size(65, 20); + this.DebugLabel.Size = new System.Drawing.Size(48, 14); this.DebugLabel.TabIndex = 38; this.DebugLabel.Text = "Debug"; // + // panel4 + // + this.panel4.BackColor = System.Drawing.Color.Transparent; + this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel4.Controls.Add(this.btnEyeDrop); + this.panel4.Controls.Add(this.btnRandomColor); + this.panel4.Controls.Add(this.btnColorPicker); + this.panel4.Controls.Add(this.btnColorHistory1); + this.panel4.Controls.Add(this.btnColorHistory2); + this.panel4.Controls.Add(this.btnColorHistory4); + this.panel4.Controls.Add(this.btnColorHistory3); + this.panel4.Location = new System.Drawing.Point(503, 6); + this.panel4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(507, 39); + this.panel4.TabIndex = 37; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("Cascadia Code", 9F, 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.Location = new System.Drawing.Point(3, 8); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(49, 16); + this.label3.TabIndex = 37; + this.label3.Text = "Layers"; + // // PaintForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 20F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 14F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34))))); - this.ClientSize = new System.Drawing.Size(1132, 655); + this.ClientSize = new System.Drawing.Size(1222, 618); + this.Controls.Add(this.panel4); this.Controls.Add(this.DebugLabel); this.Controls.Add(this.panel3); - this.Controls.Add(this.panel2); - this.Controls.Add(this.btnColorPicker); this.Controls.Add(this.panel1); this.Controls.Add(this.panelHoverColor); this.Controls.Add(this.panelSelectedColor); @@ -655,9 +649,10 @@ this.Controls.Add(this.panelFile); this.Controls.Add(this.canvas); this.DoubleBuffered = true; - this.Font = new System.Drawing.Font("Verdana", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.Margin = new System.Windows.Forms.Padding(4); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.MinimumSize = new System.Drawing.Size(1238, 549); this.Name = "PaintForm"; this.Text = "Paint 2"; this.Load += new System.EventHandler(this.PaintForm_Load); @@ -676,10 +671,9 @@ this.panelTools.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbxSample)).EndInit(); this.panel1.ResumeLayout(false); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); this.panel3.ResumeLayout(false); this.panel3.PerformLayout(); + this.panel4.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -706,7 +700,6 @@ private System.Windows.Forms.Button btnColorHistory4; private System.Windows.Forms.Button btnColorHistory3; private System.Windows.Forms.Button btnColorHistory2; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Button btnColorHistory1; private System.Windows.Forms.Button btnClear; private System.Windows.Forms.Panel panelTools; @@ -719,18 +712,17 @@ private System.Windows.Forms.Button btnColorPicker; private System.Windows.Forms.PictureBox pbxSample; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button button2; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Button button1; private System.Windows.Forms.Button btnLoadFile; private System.Windows.Forms.Button btnEyeDrop; private System.Windows.Forms.Button btnLayerRemove; private System.Windows.Forms.Button BtnAddLayer; private System.Windows.Forms.Label DebugLabel; private System.Windows.Forms.Panel pnlLayers; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Panel panel4; } } diff --git a/Paint_2/Form1.cs b/Paint_2/Form1.cs index 24c8662..aa15a75 100644 --- a/Paint_2/Form1.cs +++ b/Paint_2/Form1.cs @@ -264,7 +264,6 @@ namespace Paint_2 Console.WriteLine("Could not delete the layer"); } } - DisplayLayers(); RefreshUi(); } @@ -275,9 +274,9 @@ namespace Paint_2 DisplayLayers(); RefreshUi(); } - //This is the only really non MVC method private void DisplayLayers() { + //I know I know this is not really MVC yet but I will address that int Yoffset = 25; int Xoffset = 10;