diff --git a/Paint_2/ColorPicker.Designer.cs b/Paint_2/ColorPicker.Designer.cs index a48bc58..7a4cc42 100644 --- a/Paint_2/ColorPicker.Designer.cs +++ b/Paint_2/ColorPicker.Designer.cs @@ -77,10 +77,10 @@ // // nupRed // - this.nupRed.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + 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.Font = new System.Drawing.Font("Cascadia Code", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.nupRed.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + 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.Maximum = new decimal(new int[] { 255, @@ -94,10 +94,10 @@ // // nupGreen // - this.nupGreen.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + 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.Font = new System.Drawing.Font("Cascadia Code", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.nupGreen.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + 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.Maximum = new decimal(new int[] { 255, @@ -111,10 +111,10 @@ // // nupBlue // - this.nupBlue.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + 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.Font = new System.Drawing.Font("Cascadia Code", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.nupBlue.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + 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.Maximum = new decimal(new int[] { 255, @@ -128,10 +128,10 @@ // // nupGamma // - this.nupGamma.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + 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.Font = new System.Drawing.Font("Cascadia Code", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.nupGamma.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + 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.Maximum = new decimal(new int[] { 255, @@ -145,9 +145,9 @@ // // tbxColorHex // - this.tbxColorHex.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + 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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + 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.Name = "tbxColorHex"; this.tbxColorHex.Size = new System.Drawing.Size(100, 27); @@ -180,6 +180,7 @@ // label1 // this.label1.AutoSize = true; + 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.Name = "label1"; this.label1.Size = new System.Drawing.Size(20, 22); @@ -189,6 +190,7 @@ // label2 // this.label2.AutoSize = true; + 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.Name = "label2"; this.label2.Size = new System.Drawing.Size(20, 22); @@ -198,6 +200,7 @@ // label3 // this.label3.AutoSize = true; + 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.Name = "label3"; this.label3.Size = new System.Drawing.Size(20, 22); @@ -207,6 +210,7 @@ // label4 // this.label4.AutoSize = true; + 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.Name = "label4"; this.label4.Size = new System.Drawing.Size(20, 22); @@ -222,7 +226,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34))))); this.ClientSize = new System.Drawing.Size(440, 316); this.Controls.Add(this.label4); this.Controls.Add(this.label3); diff --git a/Paint_2/Form1.Designer.cs b/Paint_2/Form1.Designer.cs index 9bb4157..f53e864 100644 --- a/Paint_2/Form1.Designer.cs +++ b/Paint_2/Form1.Designer.cs @@ -35,6 +35,7 @@ this.btnSaveCopy = new System.Windows.Forms.Button(); this.lblSelectedColor = new System.Windows.Forms.Label(); this.panelFile = new System.Windows.Forms.Panel(); + this.btnLoadFile = new System.Windows.Forms.Button(); this.panelDrawing = new System.Windows.Forms.Panel(); this.lblHeight = new System.Windows.Forms.Label(); this.lblWidth = new System.Windows.Forms.Label(); @@ -65,11 +66,10 @@ this.label1 = new System.Windows.Forms.Label(); this.button2 = new System.Windows.Forms.Button(); this.panel3 = new System.Windows.Forms.Panel(); + this.label3 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); this.listBox1 = new System.Windows.Forms.ListBox(); - this.label3 = new System.Windows.Forms.Label(); - this.btnLoadFile = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.canvas)).BeginInit(); this.panelFile.SuspendLayout(); this.panelDrawing.SuspendLayout(); @@ -85,11 +85,11 @@ // // tbxProjectName // - this.tbxProjectName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.tbxProjectName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.tbxProjectName.Location = new System.Drawing.Point(11, 9); + this.tbxProjectName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.tbxProjectName.Location = new System.Drawing.Point(11, 5); this.tbxProjectName.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tbxProjectName.Name = "tbxProjectName"; this.tbxProjectName.Size = new System.Drawing.Size(253, 38); @@ -98,10 +98,10 @@ // // btnSave // - this.btnSave.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.btnSave.Location = new System.Drawing.Point(269, 8); + this.btnSave.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.btnSave.Location = new System.Drawing.Point(315, 166); this.btnSave.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnSave.Name = "btnSave"; this.btnSave.Size = new System.Drawing.Size(82, 39); @@ -112,8 +112,9 @@ // // canvas // - this.canvas.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); - this.canvas.Location = new System.Drawing.Point(11, 72); + this.canvas.BackColor = System.Drawing.Color.Transparent; + this.canvas.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.canvas.Location = new System.Drawing.Point(11, 67); this.canvas.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.canvas.Name = "canvas"; this.canvas.Size = new System.Drawing.Size(900, 500); @@ -124,10 +125,10 @@ // // btnSaveCopy // - this.btnSaveCopy.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.btnSaveCopy.Location = new System.Drawing.Point(355, 8); + this.btnSaveCopy.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); + this.btnSaveCopy.Location = new System.Drawing.Point(401, 166); this.btnSaveCopy.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.btnSaveCopy.Name = "btnSaveCopy"; this.btnSaveCopy.Size = new System.Drawing.Size(135, 39); @@ -139,6 +140,7 @@ // lblSelectedColor // 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.Name = "lblSelectedColor"; this.lblSelectedColor.Size = new System.Drawing.Size(288, 20); @@ -147,23 +149,35 @@ // // panelFile // - this.panelFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); - this.panelFile.Controls.Add(this.btnLoadFile); - this.panelFile.Controls.Add(this.btnSaveCopy); + this.panelFile.BackColor = System.Drawing.Color.Transparent; + this.panelFile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panelFile.Controls.Add(this.tbxProjectName); - this.panelFile.Controls.Add(this.btnSave); this.panelFile.Location = new System.Drawing.Point(12, 6); this.panelFile.Name = "panelFile"; this.panelFile.Size = new System.Drawing.Size(644, 55); this.panelFile.TabIndex = 8; // + // btnLoadFile + // + 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(540, 166); + this.btnLoadFile.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.btnLoadFile.Name = "btnLoadFile"; + this.btnLoadFile.Size = new System.Drawing.Size(143, 39); + this.btnLoadFile.TabIndex = 3; + this.btnLoadFile.Text = "Load Project"; + this.btnLoadFile.UseVisualStyleBackColor = false; + // // panelDrawing // this.panelDrawing.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.panelDrawing.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + this.panelDrawing.BackColor = System.Drawing.Color.Transparent; + 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, 580); + this.panelDrawing.Location = new System.Drawing.Point(829, 575); this.panelDrawing.Name = "panelDrawing"; this.panelDrawing.Size = new System.Drawing.Size(82, 72); this.panelDrawing.TabIndex = 30; @@ -171,6 +185,7 @@ // 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.Name = "lblHeight"; this.lblHeight.Size = new System.Drawing.Size(74, 20); @@ -180,6 +195,7 @@ // lblWidth // 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.Name = "lblWidth"; this.lblWidth.Size = new System.Drawing.Size(77, 20); @@ -189,11 +205,12 @@ // panelSelectedColor // this.panelSelectedColor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.panelSelectedColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + this.panelSelectedColor.BackColor = System.Drawing.Color.Transparent; + this.panelSelectedColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; 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, 580); + this.panelSelectedColor.Location = new System.Drawing.Point(424, 575); this.panelSelectedColor.Name = "panelSelectedColor"; this.panelSelectedColor.Size = new System.Drawing.Size(399, 72); this.panelSelectedColor.TabIndex = 31; @@ -213,6 +230,7 @@ // 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.Name = "label14"; this.label14.Size = new System.Drawing.Size(150, 22); @@ -222,11 +240,12 @@ // panelHoverColor // this.panelHoverColor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.panelHoverColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + this.panelHoverColor.BackColor = System.Drawing.Color.Transparent; + this.panelHoverColor.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; 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, 580); + this.panelHoverColor.Location = new System.Drawing.Point(11, 575); this.panelHoverColor.Name = "panelHoverColor"; this.panelHoverColor.Size = new System.Drawing.Size(407, 72); this.panelHoverColor.TabIndex = 32; @@ -245,6 +264,7 @@ // lblHoveringColor // 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.Name = "lblHoveringColor"; this.lblHoveringColor.Size = new System.Drawing.Size(288, 20); @@ -255,6 +275,7 @@ // 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.Name = "label15"; this.label15.Size = new System.Drawing.Size(150, 22); @@ -268,11 +289,11 @@ // // nupPencilWidth // - this.nupPencilWidth.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.nupPencilWidth.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.nupPencilWidth.Location = new System.Drawing.Point(117, 161); + 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.Maximum = new decimal(new int[] { 255, 0, @@ -291,8 +312,9 @@ // btnColorHistory4 // this.btnColorHistory4.BackColor = System.Drawing.Color.Red; - this.btnColorHistory4.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + 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.Name = "btnColorHistory4"; this.btnColorHistory4.Size = new System.Drawing.Size(40, 40); @@ -303,8 +325,9 @@ // btnColorHistory3 // this.btnColorHistory3.BackColor = System.Drawing.Color.Red; - this.btnColorHistory3.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + 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.Name = "btnColorHistory3"; this.btnColorHistory3.Size = new System.Drawing.Size(40, 40); @@ -315,8 +338,9 @@ // btnColorHistory2 // this.btnColorHistory2.BackColor = System.Drawing.Color.Red; - this.btnColorHistory2.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + 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.Name = "btnColorHistory2"; this.btnColorHistory2.Size = new System.Drawing.Size(40, 40); @@ -328,6 +352,7 @@ // 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); @@ -337,8 +362,9 @@ // btnColorHistory1 // this.btnColorHistory1.BackColor = System.Drawing.Color.Green; - this.btnColorHistory1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; + 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.Name = "btnColorHistory1"; this.btnColorHistory1.Size = new System.Drawing.Size(40, 40); @@ -349,11 +375,11 @@ // btnClear // this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.btnClear.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.btnClear.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.btnClear.Location = new System.Drawing.Point(6, 40); + 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.Name = "btnClear"; this.btnClear.Size = new System.Drawing.Size(190, 29); this.btnClear.TabIndex = 27; @@ -364,7 +390,8 @@ // panelTools // this.panelTools.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panelTools.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + this.panelTools.BackColor = System.Drawing.Color.Transparent; + this.panelTools.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panelTools.Controls.Add(this.pictureBox1); this.panelTools.Controls.Add(this.btnRandomColor); this.panelTools.Controls.Add(this.btnColorPicker); @@ -376,12 +403,12 @@ this.panelTools.Controls.Add(this.nupPencilWidth); this.panelTools.Location = new System.Drawing.Point(920, 6); this.panelTools.Name = "panelTools"; - this.panelTools.Size = new System.Drawing.Size(200, 204); + this.panelTools.Size = new System.Drawing.Size(200, 199); this.panelTools.TabIndex = 31; // // pictureBox1 // - this.pictureBox1.Location = new System.Drawing.Point(10, 161); + this.pictureBox1.Location = new System.Drawing.Point(10, 152); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(101, 33); this.pictureBox1.TabIndex = 35; @@ -389,10 +416,10 @@ // // btnRandomColor // - this.btnRandomColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.btnRandomColor.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + 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.Name = "btnRandomColor"; this.btnRandomColor.Size = new System.Drawing.Size(178, 33); @@ -403,10 +430,10 @@ // // btnColorPicker // - this.btnColorPicker.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.btnColorPicker.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + this.btnColorPicker.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.btnColorPicker.Location = new System.Drawing.Point(10, 72); this.btnColorPicker.Name = "btnColorPicker"; this.btnColorPicker.Size = new System.Drawing.Size(177, 35); @@ -417,11 +444,11 @@ // // btnRedo // - this.btnRedo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.btnRedo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.btnRedo.Location = new System.Drawing.Point(6, 6); + 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.Name = "btnRedo"; this.btnRedo.Size = new System.Drawing.Size(90, 28); this.btnRedo.TabIndex = 36; @@ -431,11 +458,11 @@ // // btnUndo // - this.btnUndo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.btnUndo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); 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)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.btnUndo.Location = new System.Drawing.Point(106, 6); + 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.Name = "btnUndo"; this.btnUndo.Size = new System.Drawing.Size(90, 28); this.btnUndo.TabIndex = 35; @@ -445,9 +472,9 @@ // // lsbTools // - this.lsbTools.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.lsbTools.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.lsbTools.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lsbTools.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + 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); @@ -459,11 +486,12 @@ // panel1 // this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + 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, 580); + this.panel1.Location = new System.Drawing.Point(920, 575); this.panel1.Name = "panel1"; this.panel1.Size = new System.Drawing.Size(200, 72); this.panel1.TabIndex = 35; @@ -471,11 +499,12 @@ // panel2 // this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + 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, 216); + this.panel2.Location = new System.Drawing.Point(920, 211); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(200, 175); this.panel2.TabIndex = 36; @@ -484,6 +513,7 @@ // 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.Name = "label1"; this.label1.Size = new System.Drawing.Size(108, 20); @@ -497,7 +527,7 @@ 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(11, -193); + 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; @@ -507,16 +537,28 @@ // panel3 // this.panel3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(31)))), ((int)(((byte)(31))))); + 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.label2); this.panel3.Controls.Add(this.button1); this.panel3.Controls.Add(this.listBox1); - this.panel3.Location = new System.Drawing.Point(920, 397); + this.panel3.Location = new System.Drawing.Point(920, 392); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(200, 175); this.panel3.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(8, 10); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(135, 20); + this.label3.TabIndex = 37; + this.label3.Text = "Drawing Layers"; + // // label2 // this.label2.AutoSize = true; @@ -533,7 +575,7 @@ 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(11, -193); + 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; @@ -542,9 +584,9 @@ // // listBox1 // - this.listBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); + this.listBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(59)))), ((int)(((byte)(59)))), ((int)(((byte)(59))))); this.listBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.listBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); + this.listBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(247)))), ((int)(((byte)(247)))), ((int)(((byte)(247))))); this.listBox1.FormattingEnabled = true; this.listBox1.ItemHeight = 20; this.listBox1.Location = new System.Drawing.Point(10, 33); @@ -552,37 +594,17 @@ this.listBox1.Size = new System.Drawing.Size(179, 122); this.listBox1.TabIndex = 32; // - // 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.Location = new System.Drawing.Point(8, 10); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(135, 20); - this.label3.TabIndex = 37; - this.label3.Text = "Drawing Layers"; - // - // btnLoadFile - // - this.btnLoadFile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(41)))), ((int)(((byte)(41))))); - this.btnLoadFile.FlatStyle = System.Windows.Forms.FlatStyle.Popup; - this.btnLoadFile.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(214)))), ((int)(((byte)(214)))), ((int)(((byte)(214))))); - this.btnLoadFile.Location = new System.Drawing.Point(494, 8); - this.btnLoadFile.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.btnLoadFile.Name = "btnLoadFile"; - this.btnLoadFile.Size = new System.Drawing.Size(143, 39); - this.btnLoadFile.TabIndex = 3; - this.btnLoadFile.Text = "Load Project"; - this.btnLoadFile.UseVisualStyleBackColor = false; - // // PaintForm // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(18)))), ((int)(((byte)(18)))), ((int)(((byte)(18))))); - this.ClientSize = new System.Drawing.Size(1132, 660); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34))))); + this.ClientSize = new System.Drawing.Size(1132, 655); + this.Controls.Add(this.btnLoadFile); this.Controls.Add(this.panel3); + this.Controls.Add(this.btnSaveCopy); this.Controls.Add(this.panel2); + this.Controls.Add(this.btnSave); this.Controls.Add(this.panel1); this.Controls.Add(this.panelHoverColor); this.Controls.Add(this.panelSelectedColor); diff --git a/Paint_2/Form1.cs b/Paint_2/Form1.cs index 88ec227..88a3c95 100644 --- a/Paint_2/Form1.cs +++ b/Paint_2/Form1.cs @@ -22,6 +22,9 @@ namespace Paint_2 { const int WINDOW_OFFSET = 15; const string DEFAULT_FILEPATH = "C:/Paint2/Drawings/"; + Color FLAT_RED = Color.FromArgb(0xC6,0x28,0x28); + Color FLAT_GREEN = Color.FromArgb(0x00,0x89,0x7B); + public Sketch sketch; List toolList; bool drawing = false; @@ -116,11 +119,11 @@ namespace Paint_2 if (randomColor) { - btnRandomColor.ForeColor = Color.Green; + btnRandomColor.BackColor = FLAT_GREEN; } else { - btnRandomColor.ForeColor = Color.Red; + btnRandomColor.BackColor = FLAT_RED; } } private Color GetHoverColor() diff --git a/Paint_2/PaintToolUtils.cs b/Paint_2/PaintToolUtils.cs index 26c1215..3373dfc 100644 --- a/Paint_2/PaintToolUtils.cs +++ b/Paint_2/PaintToolUtils.cs @@ -16,6 +16,7 @@ namespace Paint_2 internal class PaintToolUtils { private PaintTool Target; + private Color DEFAULT_COLOR = Color.FromArgb(59, 59, 59); public PaintToolUtils(PaintTool target) { Target = target; @@ -86,7 +87,7 @@ namespace Paint_2 } for (int i = colorNumber - result.Count; i > 0; i--) { - result.Add(Color.FromArgb(0x00, 0x00, 0x00)); + result.Add(DEFAULT_COLOR); } result.Reverse(); return result;