From cf52c0023e924797c46df5a30e1d4d496319eac7 Mon Sep 17 00:00:00 2001 From: EternalModz <86510009+EternalModz@users.noreply.github.com> Date: Sat, 15 Mar 2025 13:02:45 -0700 Subject: [PATCH] Updated designs for "animation" forms. --- .../Animation/FrameEditor.Designer.cs | 8 +-- .../Animation/FrameEditor.cs | 63 +++++++++---------- .../Animation/SetBulkSpeed.Designer.cs | 16 ++--- 3 files changed, 43 insertions(+), 44 deletions(-) diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs index c9f78ab5..9644c012 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.Designer.cs @@ -49,7 +49,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.label1.Location = new System.Drawing.Point(219, 45); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(73, 15); + this.label1.Size = new System.Drawing.Size(126, 30); this.label1.TabIndex = 10; this.label1.Text = "Frame Time:"; // @@ -61,7 +61,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.label3.Location = new System.Drawing.Point(133, 10); this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(121, 15); + this.label3.Size = new System.Drawing.Size(213, 30); this.label3.TabIndex = 12; this.label3.Text = "may/matt was here :3"; // @@ -83,7 +83,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation 0, 0}); this.FrameTimeUpDown.Name = "FrameTimeUpDown"; - this.FrameTimeUpDown.Size = new System.Drawing.Size(85, 23); + this.FrameTimeUpDown.Size = new System.Drawing.Size(85, 35); this.FrameTimeUpDown.TabIndex = 15; this.FrameTimeUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.FrameTimeUpDown.Value = new decimal(new int[] { @@ -177,7 +177,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation // // FrameEditor // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F); 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(399, 241); diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.cs b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.cs index b7d38815..e11afea1 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/FrameEditor.cs @@ -1,43 +1,42 @@ -using System; -using MetroFramework.Forms; +using PckStudio.ToolboxItems; +using System; using System.Windows.Forms; -using PckStudio.ToolboxItems; namespace PckStudio.Forms.Additional_Popups.Animation { - public partial class FrameEditor : ThemeForm - { - public int FrameTextureIndex => FrameList.SelectedNode.Index; - public int FrameTime => (int)FrameTimeUpDown.Value; + public partial class FrameEditor : ThemeForm + { + public int FrameTextureIndex => FrameList.SelectedNode.Index; + public int FrameTime => (int)FrameTimeUpDown.Value; - public FrameEditor(ImageList texList) - { - InitializeComponent(); - FrameList.ImageList = texList; - for (int index = 0; index < texList.Images.Count; index++) - { - TreeNode frame = new TreeNode($"Frame {index}", index, index); - FrameList.Nodes.Add(frame); - } - } + public FrameEditor(ImageList texList) + { + InitializeComponent(); + FrameList.ImageList = texList; + for (int index = 0; index < texList.Images.Count; index++) + { + TreeNode frame = new TreeNode($"Frame {index}", index, index); + FrameList.Nodes.Add(frame); + } + } - public FrameEditor(int frameTime, int frameTextureIndex, ImageList texList) : this(texList) - { - FrameList.SelectedNode = FrameList.Nodes[frameTextureIndex]; - FrameList.SelectedNode.EnsureVisible(); - FrameTimeUpDown.Value = frameTime; - } + public FrameEditor(int frameTime, int frameTextureIndex, ImageList texList) : this(texList) + { + FrameList.SelectedNode = FrameList.Nodes[frameTextureIndex]; + FrameList.SelectedNode.EnsureVisible(); + FrameTimeUpDown.Value = frameTime; + } - private void SaveBtn_Click(object sender, EventArgs e) - { - DialogResult = DialogResult.OK; - Close(); - } + private void SaveBtn_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.OK; + Close(); + } - private void CancelBtn_Click(object sender, EventArgs e) - { + private void CancelBtn_Click(object sender, EventArgs e) + { DialogResult = DialogResult.Cancel; Close(); - } - } + } + } } diff --git a/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.Designer.cs b/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.Designer.cs index 02ca86a0..c539472c 100644 --- a/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.Designer.cs +++ b/PCK-Studio/Forms/Additional-Popups/Animation/SetBulkSpeed.Designer.cs @@ -43,7 +43,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.label1.AutoSize = true; this.label1.ForeColor = System.Drawing.Color.White; this.label1.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.label1.Location = new System.Drawing.Point(14, 36); + this.label1.Location = new System.Drawing.Point(38, 41); this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(96, 15); @@ -67,7 +67,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.TimeUpDown.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(17)))), ((int)(((byte)(17)))), ((int)(((byte)(17))))); this.TimeUpDown.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.TimeUpDown.ForeColor = System.Drawing.SystemColors.Window; - this.TimeUpDown.Location = new System.Drawing.Point(118, 34); + this.TimeUpDown.Location = new System.Drawing.Point(142, 39); this.TimeUpDown.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.TimeUpDown.Maximum = new decimal(new int[] { 10000, @@ -75,7 +75,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation 0, 0}); this.TimeUpDown.Name = "TimeUpDown"; - this.TimeUpDown.Size = new System.Drawing.Size(189, 23); + this.TimeUpDown.Size = new System.Drawing.Size(140, 23); this.TimeUpDown.TabIndex = 15; this.TimeUpDown.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -97,10 +97,10 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.CancelButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(250)))), ((int)(((byte)(36)))), ((int)(((byte)(38))))); this.CancelButton.Image = ((System.Drawing.Image)(resources.GetObject("CancelButton.Image"))); this.CancelButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.CancelButton.Location = new System.Drawing.Point(164, 90); + this.CancelButton.Location = new System.Drawing.Point(164, 89); this.CancelButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.CancelButton.Name = "CancelButton"; - this.CancelButton.Size = new System.Drawing.Size(106, 46); + this.CancelButton.Size = new System.Drawing.Size(81, 39); this.CancelButton.TabIndex = 24; this.CancelButton.Text = "Cancel"; this.CancelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -127,10 +127,10 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.SaveButton.HoverOverColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(250)))), ((int)(((byte)(165))))); this.SaveButton.Image = ((System.Drawing.Image)(resources.GetObject("SaveButton.Image"))); this.SaveButton.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.SaveButton.Location = new System.Drawing.Point(50, 90); + this.SaveButton.Location = new System.Drawing.Point(75, 89); this.SaveButton.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.SaveButton.Name = "SaveButton"; - this.SaveButton.Size = new System.Drawing.Size(106, 46); + this.SaveButton.Size = new System.Drawing.Size(81, 39); this.SaveButton.TabIndex = 23; this.SaveButton.Text = "Save"; this.SaveButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -144,7 +144,7 @@ namespace PckStudio.Forms.Additional_Popups.Animation this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); 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(321, 148); + this.ClientSize = new System.Drawing.Size(321, 140); this.Controls.Add(this.CancelButton); this.Controls.Add(this.SaveButton); this.Controls.Add(this.label3);