diff --git a/PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs b/PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs index 3833e018..4476b332 100644 --- a/PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/TextureAtlasEditor.Designer.cs @@ -37,17 +37,17 @@ this.applyColorMaskToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.playAnimationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.variantComboBox = new MetroFramework.Controls.MetroComboBox(); this.colorSliderLabel = new MetroFramework.Controls.MetroLabel(); - this.originalPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); - this.selectTilePictureBox = new PckStudio.ToolboxItems.AnimationPictureBox(); this.replaceButton = new MetroFramework.Controls.MetroButton(); this.tileNameLabel = new MetroFramework.Controls.MetroLabel(); - this.variantComboBox = new MetroFramework.Controls.MetroComboBox(); this.setColorButton = new MetroFramework.Controls.MetroButton(); this.animationButton = new MetroFramework.Controls.MetroButton(); this.clearColorButton = new MetroFramework.Controls.MetroButton(); this.colorSlider = new MetroFramework.Controls.MetroTrackBar(); - this.metroButton1 = new MetroFramework.Controls.MetroButton(); + this.extractButton = new MetroFramework.Controls.MetroButton(); + this.originalPictureBox = new PckStudio.ToolboxItems.InterpolationPictureBox(); + this.selectTilePictureBox = new PckStudio.ToolboxItems.AnimationPictureBox(); this.menuStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.originalPictureBox)).BeginInit(); @@ -56,13 +56,12 @@ // // variantLabel // - this.variantLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); + this.variantLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.variantLabel.AutoSize = true; - this.variantLabel.Location = new System.Drawing.Point(3, 254); + this.tableLayoutPanel1.SetColumnSpan(this.variantLabel, 2); + this.variantLabel.Location = new System.Drawing.Point(3, 239); this.variantLabel.Name = "variantLabel"; - this.variantLabel.Size = new System.Drawing.Size(208, 24); + this.variantLabel.Size = new System.Drawing.Size(208, 19); this.variantLabel.TabIndex = 18; this.variantLabel.Text = "Variant:"; this.variantLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -135,45 +134,58 @@ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 10.43842F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 26.09603F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 63.46555F)); - this.tableLayoutPanel1.Controls.Add(this.variantComboBox, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.variantLabel, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.colorSliderLabel, 0, 3); this.tableLayoutPanel1.Controls.Add(this.originalPictureBox, 2, 0); this.tableLayoutPanel1.Controls.Add(this.selectTilePictureBox, 0, 0); - this.tableLayoutPanel1.Controls.Add(this.replaceButton, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.replaceButton, 0, 8); this.tableLayoutPanel1.Controls.Add(this.tileNameLabel, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.setColorButton, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.animationButton, 1, 7); - this.tableLayoutPanel1.Controls.Add(this.clearColorButton, 1, 4); - this.tableLayoutPanel1.Controls.Add(this.colorSlider, 1, 3); - this.tableLayoutPanel1.Controls.Add(this.metroButton1, 0, 6); + this.tableLayoutPanel1.Controls.Add(this.setColorButton, 0, 5); + this.tableLayoutPanel1.Controls.Add(this.animationButton, 1, 8); + this.tableLayoutPanel1.Controls.Add(this.clearColorButton, 1, 5); + this.tableLayoutPanel1.Controls.Add(this.extractButton, 0, 7); + this.tableLayoutPanel1.Controls.Add(this.colorSlider, 1, 4); + this.tableLayoutPanel1.Controls.Add(this.colorSliderLabel, 0, 4); + this.tableLayoutPanel1.Controls.Add(this.variantComboBox, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.variantLabel, 0, 2); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.Location = new System.Drawing.Point(20, 84); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 8; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 36.3643F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.545537F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.545537F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 36.3643F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.545537F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.543719F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.545537F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.545537F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowCount = 6; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 38.68709F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.835886F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.835886F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.14977F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 16.14977F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.835886F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.833951F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.835886F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 4.835886F)); this.tableLayoutPanel1.Size = new System.Drawing.Size(590, 565); this.tableLayoutPanel1.TabIndex = 17; // + // variantComboBox + // + this.variantComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.SetColumnSpan(this.variantComboBox, 2); + this.variantComboBox.Enabled = false; + this.variantComboBox.FormattingEnabled = true; + this.variantComboBox.ItemHeight = 23; + this.variantComboBox.Location = new System.Drawing.Point(3, 291); + this.variantComboBox.Name = "variantComboBox"; + this.variantComboBox.Size = new System.Drawing.Size(208, 29); + this.variantComboBox.TabIndex = 17; + this.variantComboBox.Theme = MetroFramework.MetroThemeStyle.Dark; + this.variantComboBox.UseSelectable = true; + this.variantComboBox.SelectedIndexChanged += new System.EventHandler(this.variantComboBox_SelectedIndexChanged); + // // colorSliderLabel // this.colorSliderLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.colorSliderLabel.AutoSize = true; this.colorSliderLabel.BackColor = System.Drawing.Color.Transparent; - this.colorSliderLabel.Location = new System.Drawing.Point(3, 246); + this.colorSliderLabel.Location = new System.Drawing.Point(3, 350); this.colorSliderLabel.Name = "colorSliderLabel"; - this.colorSliderLabel.Size = new System.Drawing.Size(55, 198); + this.colorSliderLabel.Size = new System.Drawing.Size(55, 88); this.colorSliderLabel.TabIndex = 19; this.colorSliderLabel.Text = "Color Range:"; this.colorSliderLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -181,6 +193,110 @@ this.colorSliderLabel.Visible = false; this.colorSliderLabel.WrapToLine = true; // + // replaceButton + // + this.replaceButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.replaceButton.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.replaceButton, 2); + this.replaceButton.Location = new System.Drawing.Point(3, 519); + this.replaceButton.Name = "replaceButton"; + this.replaceButton.Size = new System.Drawing.Size(208, 20); + this.replaceButton.TabIndex = 14; + this.replaceButton.Text = "Replace Tile on Atlas"; + this.replaceButton.Theme = MetroFramework.MetroThemeStyle.Dark; + this.replaceButton.UseSelectable = true; + this.replaceButton.Click += new System.EventHandler(this.replaceButton_Click); + // + // tileNameLabel + // + this.tileNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tileNameLabel.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.tileNameLabel, 2); + this.tileNameLabel.Location = new System.Drawing.Point(3, 217); + this.tileNameLabel.Name = "tileNameLabel"; + this.tileNameLabel.Size = new System.Drawing.Size(208, 19); + this.tileNameLabel.TabIndex = 19; + this.tileNameLabel.Text = "TileName"; + this.tileNameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.tileNameLabel.Theme = MetroFramework.MetroThemeStyle.Dark; + this.tileNameLabel.WrapToLine = true; + // + // setColorButton + // + this.setColorButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.SetColumnSpan(this.setColorButton, 2); + this.setColorButton.Location = new System.Drawing.Point(3, 444); + this.setColorButton.Name = "setColorButton"; + this.setColorButton.Size = new System.Drawing.Size(208, 17); + this.setColorButton.TabIndex = 25; + this.setColorButton.Text = "Set Custom Colour"; + this.setColorButton.Theme = MetroFramework.MetroThemeStyle.Dark; + this.setColorButton.UseSelectable = true; + this.setColorButton.Click += new System.EventHandler(this.setColorButton_Click); + // + // animationButton + // + this.animationButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.animationButton.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.animationButton, 2); + this.animationButton.Location = new System.Drawing.Point(3, 545); + this.animationButton.Name = "animationButton"; + this.animationButton.Size = new System.Drawing.Size(208, 17); + this.animationButton.TabIndex = 16; + this.animationButton.Text = "Animation"; + this.animationButton.Theme = MetroFramework.MetroThemeStyle.Dark; + this.animationButton.UseSelectable = true; + this.animationButton.Click += new System.EventHandler(this.animationButton_Click); + // + // clearColorButton + // + this.clearColorButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.clearColorButton.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.clearColorButton, 2); + this.clearColorButton.Location = new System.Drawing.Point(3, 467); + this.clearColorButton.Name = "clearColorButton"; + this.clearColorButton.Size = new System.Drawing.Size(208, 20); + this.clearColorButton.TabIndex = 24; + this.clearColorButton.Text = "Clear Custom Colour"; + this.clearColorButton.Theme = MetroFramework.MetroThemeStyle.Dark; + this.clearColorButton.UseSelectable = true; + this.clearColorButton.Click += new System.EventHandler(this.clearColorButton_Click); + // + // colorSlider + // + this.colorSlider.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); + this.colorSlider.BackColor = System.Drawing.Color.Transparent; + this.colorSlider.Location = new System.Drawing.Point(64, 353); + this.colorSlider.Maximum = 255; + this.colorSlider.Name = "colorSlider"; + this.colorSlider.Size = new System.Drawing.Size(147, 82); + this.colorSlider.TabIndex = 26; + this.colorSlider.Text = "metroTrackBar1"; + this.colorSlider.Theme = MetroFramework.MetroThemeStyle.Dark; + this.colorSlider.Value = 0; + this.colorSlider.Visible = false; + this.colorSlider.ValueChanged += new System.EventHandler(this.colorSlider_ValueChanged); + // + // extractButton + // + this.extractButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.extractButton.AutoSize = true; + this.tableLayoutPanel1.SetColumnSpan(this.extractButton, 2); + this.extractButton.Location = new System.Drawing.Point(3, 493); + this.extractButton.Name = "extractButton"; + this.extractButton.Size = new System.Drawing.Size(208, 20); + this.extractButton.TabIndex = 27; + this.extractButton.Text = "Extract Tile from Atlas"; + this.extractButton.Theme = MetroFramework.MetroThemeStyle.Dark; + this.extractButton.UseSelectable = true; + this.extractButton.Click += new System.EventHandler(this.extractTileToolStripMenuItem_Click); + // // originalPictureBox // this.originalPictureBox.BackColor = System.Drawing.Color.Transparent; @@ -188,8 +304,8 @@ this.originalPictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor; this.originalPictureBox.Location = new System.Drawing.Point(217, 3); this.originalPictureBox.Name = "originalPictureBox"; - this.tableLayoutPanel1.SetRowSpan(this.originalPictureBox, 8); - this.originalPictureBox.Size = new System.Drawing.Size(370, 534); + this.tableLayoutPanel1.SetRowSpan(this.originalPictureBox, 9); + this.originalPictureBox.Size = new System.Drawing.Size(370, 536); this.originalPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.originalPictureBox.TabIndex = 4; this.originalPictureBox.TabStop = false; @@ -208,124 +324,12 @@ this.selectTilePictureBox.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor; this.selectTilePictureBox.Location = new System.Drawing.Point(3, 3); this.selectTilePictureBox.Name = "selectTilePictureBox"; - this.selectTilePictureBox.Size = new System.Drawing.Size(208, 192); + this.selectTilePictureBox.Size = new System.Drawing.Size(208, 204); this.selectTilePictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; this.selectTilePictureBox.TabIndex = 0; this.selectTilePictureBox.TabStop = false; this.selectTilePictureBox.UseBlendColor = true; // - // replaceButton - // - this.replaceButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.replaceButton.AutoSize = true; - this.tableLayoutPanel1.SetColumnSpan(this.replaceButton, 2); - this.replaceButton.Location = new System.Drawing.Point(3, 519); - this.replaceButton.Name = "replaceButton"; - this.replaceButton.Size = new System.Drawing.Size(208, 18); - this.replaceButton.TabIndex = 14; - this.replaceButton.Text = "Replace Tile on Atlas"; - this.replaceButton.Theme = MetroFramework.MetroThemeStyle.Dark; - this.replaceButton.UseSelectable = true; - this.replaceButton.Click += new System.EventHandler(this.replaceButton_Click); - // - // tileNameLabel - // - this.tileNameLabel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.tileNameLabel.AutoSize = true; - this.tableLayoutPanel1.SetColumnSpan(this.tileNameLabel, 2); - this.tileNameLabel.Location = new System.Drawing.Point(3, 203); - this.tileNameLabel.Name = "tileNameLabel"; - this.tileNameLabel.Size = new System.Drawing.Size(208, 43); - this.tileNameLabel.TabIndex = 19; - this.tileNameLabel.Text = "TileName"; - this.tileNameLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.tileNameLabel.Theme = MetroFramework.MetroThemeStyle.Dark; - this.tileNameLabel.WrapToLine = true; - // - // variantComboBox - // - this.variantComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.tableLayoutPanel1.SetColumnSpan(this.variantComboBox, 2); - this.variantComboBox.Enabled = false; - this.variantComboBox.FormattingEnabled = true; - this.variantComboBox.ItemHeight = 23; - this.variantComboBox.Location = new System.Drawing.Point(3, 287); - this.variantComboBox.Name = "variantComboBox"; - this.variantComboBox.Size = new System.Drawing.Size(208, 29); - this.variantComboBox.TabIndex = 17; - this.variantComboBox.Theme = MetroFramework.MetroThemeStyle.Dark; - this.variantComboBox.UseSelectable = true; - this.variantComboBox.SelectedIndexChanged += new System.EventHandler(this.variantComboBox_SelectedIndexChanged); - // - // setColorButton - // - this.setColorButton.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.tableLayoutPanel1.SetColumnSpan(this.setColorButton, 2); - this.setColorButton.Location = new System.Drawing.Point(3, 447); - this.setColorButton.Name = "setColorButton"; - this.setColorButton.Size = new System.Drawing.Size(208, 18); - this.setColorButton.TabIndex = 25; - this.setColorButton.Text = "Set Custom Colour"; - this.setColorButton.Theme = MetroFramework.MetroThemeStyle.Dark; - this.setColorButton.UseSelectable = true; - this.setColorButton.Click += new System.EventHandler(this.setColorButton_Click); - // - // animationButton - // - this.animationButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.animationButton.AutoSize = true; - this.tableLayoutPanel1.SetColumnSpan(this.animationButton, 2); - this.animationButton.Location = new System.Drawing.Point(3, 543); - this.animationButton.Name = "animationButton"; - this.animationButton.Size = new System.Drawing.Size(208, 19); - this.animationButton.TabIndex = 16; - this.animationButton.Text = "Animation"; - this.animationButton.Theme = MetroFramework.MetroThemeStyle.Dark; - this.animationButton.UseSelectable = true; - this.animationButton.Click += new System.EventHandler(this.animationButton_Click); - // - // clearColorButton - // - this.clearColorButton.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.tableLayoutPanel1.SetColumnSpan(this.clearColorButton, 2); - this.clearColorButton.Location = new System.Drawing.Point(3, 471); - this.clearColorButton.Name = "clearColorButton"; - this.clearColorButton.Size = new System.Drawing.Size(208, 18); - this.clearColorButton.TabIndex = 24; - this.clearColorButton.Text = "Clear Custom Colour"; - this.clearColorButton.Theme = MetroFramework.MetroThemeStyle.Dark; - this.clearColorButton.UseSelectable = true; - this.clearColorButton.Click += new System.EventHandler(this.clearColorButton_Click); - // - // colorSlider - // - this.colorSlider.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom))); - this.colorSlider.BackColor = System.Drawing.Color.Transparent; - this.colorSlider.Location = new System.Drawing.Point(64, 249); - this.colorSlider.Maximum = 255; - this.colorSlider.Name = "colorSlider"; - this.colorSlider.Size = new System.Drawing.Size(147, 192); - this.colorSlider.TabIndex = 26; - this.colorSlider.Text = "metroTrackBar1"; - this.colorSlider.Theme = MetroFramework.MetroThemeStyle.Dark; - this.colorSlider.Value = 0; - this.colorSlider.Visible = false; - this.colorSlider.ValueChanged += new System.EventHandler(this.colorSlider_ValueChanged); - // - // metroButton1 - // - this.tableLayoutPanel1.SetColumnSpan(this.metroButton1, 2); - this.metroButton1.Location = new System.Drawing.Point(3, 495); - this.metroButton1.Name = "metroButton1"; - this.metroButton1.Size = new System.Drawing.Size(208, 18); - this.metroButton1.TabIndex = 27; - this.metroButton1.Text = "Extract Tile from Atlas"; - this.metroButton1.Theme = MetroFramework.MetroThemeStyle.Dark; - this.metroButton1.UseSelectable = true; - // // TextureAtlasEditor // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -373,6 +377,6 @@ private MetroFramework.Controls.MetroButton setColorButton; private MetroFramework.Controls.MetroTrackBar colorSlider; private MetroFramework.Controls.MetroLabel colorSliderLabel; - private MetroFramework.Controls.MetroButton metroButton1; + private MetroFramework.Controls.MetroButton extractButton; } } \ No newline at end of file diff --git a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs index 81334a5a..6d64dd4b 100644 --- a/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs +++ b/PCK-Studio/Forms/Editor/TextureAtlasEditor.cs @@ -208,7 +208,6 @@ namespace PckStudio.Forms.Editor bool hasAnimation = _pckFile.TryGetValue($"res/textures/{_atlasType}/{dataTile.Tile.InternalName}.png", PckFileType.TextureFile, out var animationFile); animationButton.Text = hasAnimation ? "Edit Animation" : "Create Animation"; - replaceButton.Enabled = !hasAnimation; if (playAnimationsToolStripMenuItem.Checked && hasAnimation && @@ -433,6 +432,8 @@ namespace PckStudio.Forms.Editor if (e.Button != MouseButtons.Left) return; + ActiveControl = null; + int index = GetSelectedImageIndex( originalPictureBox.Size, _workingTexture.Size,