diff --git a/PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs b/PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs
index 82815424..4e235dba 100644
--- a/PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs
+++ b/PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs
@@ -47,7 +47,7 @@
this.captureScreenshotButton = new MetroFramework.Controls.MetroButton();
this.showToolsCheckBox = new MetroFramework.Controls.MetroCheckBox();
this.skinNameLabel = new MetroFramework.Controls.MetroLabel();
- this.metroTabControl1 = new MetroFramework.Controls.MetroTabControl();
+ this.parameterTabControl = new MetroFramework.Controls.MetroTabControl();
this.skinPartsTabPage = new System.Windows.Forms.TabPage();
this.skinOffsetsTabPage = new System.Windows.Forms.TabPage();
this.offsetListBox = new System.Windows.Forms.ListBox();
@@ -63,7 +63,7 @@
this.boxEditorControl1 = new PckStudio.Controls.BoxEditorControl();
this.skinAdjustmentsEditorControl1 = new PckStudio.Controls.SkinAdjustmentsEditorControl();
this.skinPartTabContextMenu.SuspendLayout();
- this.metroTabControl1.SuspendLayout();
+ this.parameterTabControl.SuspendLayout();
this.skinPartsTabPage.SuspendLayout();
this.skinOffsetsTabPage.SuspendLayout();
this.offsetTabContextMenu.SuspendLayout();
@@ -210,17 +210,17 @@
this.skinNameLabel.Name = "skinNameLabel";
this.skinNameLabel.Theme = MetroFramework.MetroThemeStyle.Dark;
//
- // metroTabControl1
+ // parameterTabControl
//
- resources.ApplyResources(this.metroTabControl1, "metroTabControl1");
- this.metroTabControl1.Controls.Add(this.skinPartsTabPage);
- this.metroTabControl1.Controls.Add(this.skinOffsetsTabPage);
- this.metroTabControl1.Multiline = true;
- this.metroTabControl1.Name = "metroTabControl1";
- this.metroTabControl1.SelectedIndex = 0;
- this.metroTabControl1.Style = MetroFramework.MetroColorStyle.Pink;
- this.metroTabControl1.Theme = MetroFramework.MetroThemeStyle.Dark;
- this.metroTabControl1.UseSelectable = true;
+ resources.ApplyResources(this.parameterTabControl, "parameterTabControl");
+ this.parameterTabControl.Controls.Add(this.skinPartsTabPage);
+ this.parameterTabControl.Controls.Add(this.skinOffsetsTabPage);
+ this.parameterTabControl.Multiline = true;
+ this.parameterTabControl.Name = "parameterTabControl";
+ this.parameterTabControl.SelectedIndex = 0;
+ this.parameterTabControl.Style = MetroFramework.MetroColorStyle.Pink;
+ this.parameterTabControl.Theme = MetroFramework.MetroThemeStyle.Dark;
+ this.parameterTabControl.UseSelectable = true;
//
// skinPartsTabPage
//
@@ -345,7 +345,7 @@
resources.ApplyResources(this, "$this");
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.skinAdjustmentsEditorControl1);
- this.Controls.Add(this.metroTabControl1);
+ this.Controls.Add(this.parameterTabControl);
this.Controls.Add(this.boxEditorControl1);
this.Controls.Add(this.exportTextureButton);
this.Controls.Add(this.importTextureButton);
@@ -369,7 +369,7 @@
this.Theme = MetroFramework.MetroThemeStyle.Dark;
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.CustomSkinEditor_FormClosing);
this.skinPartTabContextMenu.ResumeLayout(false);
- this.metroTabControl1.ResumeLayout(false);
+ this.parameterTabControl.ResumeLayout(false);
this.skinPartsTabPage.ResumeLayout(false);
this.skinOffsetsTabPage.ResumeLayout(false);
this.offsetTabContextMenu.ResumeLayout(false);
@@ -399,7 +399,7 @@
private MetroFramework.Controls.MetroButton captureScreenshotButton;
private MetroFramework.Controls.MetroCheckBox showToolsCheckBox;
private MetroFramework.Controls.MetroLabel skinNameLabel;
- private MetroFramework.Controls.MetroTabControl metroTabControl1;
+ private MetroFramework.Controls.MetroTabControl parameterTabControl;
private System.Windows.Forms.TabPage skinPartsTabPage;
private System.Windows.Forms.TabPage skinOffsetsTabPage;
private System.Windows.Forms.ListBox offsetListBox;
diff --git a/PCK-Studio/Forms/Editor/CustomSkinEditor.cs b/PCK-Studio/Forms/Editor/CustomSkinEditor.cs
index 28979fe1..29e81c3b 100644
--- a/PCK-Studio/Forms/Editor/CustomSkinEditor.cs
+++ b/PCK-Studio/Forms/Editor/CustomSkinEditor.cs
@@ -49,7 +49,7 @@ namespace PckStudio.Forms.Editor
_rng = new Random();
_skinPartListBindingSource = new BindingSource(renderer3D1.ModelData, null);
skinPartListBox.DataSource = _skinPartListBindingSource;
- skinPartListBox.DisplayMember = "Type";
+ skinPartListBox.DisplayMember = "DisplayInfo";
_xmlVersion = xmlVersion;
boxEditorControl1.SetBOXVersion(xmlVersion);
_inflateOverlayParts = _xmlVersion > 0;
diff --git a/PCK-Studio/Forms/Editor/CustomSkinEditor.resx b/PCK-Studio/Forms/Editor/CustomSkinEditor.resx
index fdc42a53..01a5733d 100644
--- a/PCK-Studio/Forms/Editor/CustomSkinEditor.resx
+++ b/PCK-Studio/Forms/Editor/CustomSkinEditor.resx
@@ -410,7 +410,7 @@
0, 0
- 157, 114
+ 157, 113
0
@@ -508,14 +508,14 @@
16
-
+
Bottom, Right
4, 38
- 157, 114
+ 157, 113
0
@@ -530,7 +530,7 @@
System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- metroTabControl1
+ parameterTabControl
0
@@ -566,7 +566,7 @@
0, 0
- 157, 114
+ 157, 128
0
@@ -587,7 +587,7 @@
4, 38
- 157, 114
+ 157, 128
1
@@ -602,30 +602,30 @@
System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- metroTabControl1
+ parameterTabControl
1
-
- 632, 21
+
+ 632, 22
-
- 165, 156
+
+ 165, 155
-
+
1
-
- metroTabControl1
+
+ parameterTabControl
-
+
MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a
-
+
$this
-
+
3
diff --git a/PckStudio.Core/Skin/SkinBOX.cs b/PckStudio.Core/Skin/SkinBOX.cs
index 8802bb2c..963e8517 100644
--- a/PckStudio.Core/Skin/SkinBOX.cs
+++ b/PckStudio.Core/Skin/SkinBOX.cs
@@ -93,6 +93,11 @@ namespace PckStudio.Core.Skin
public int ArmorMaskFlags { get; }
public bool Mirror { get; }
public float Scale { get; }
+ // Simplified display info for the CustomSkinEditor
+ public string DisplayInfo
+ {
+ get { return $"{Type} ({Size.X}x{Size.Y}x{Size.Z})".Replace(',', '.'); }
+ }
public SkinBOX(string type, Vector3 pos, Vector3 size, Vector2 uv,
int armorMaskFlags = 0, bool mirror = false, float scale = 0.0f)