Skip to content

Commit cacdaf3

Browse files
MayN-LMayN-L
committed
SkinEditor now displays box dimensions in list
1 parent e59b7d3 commit cacdaf3

4 files changed

Lines changed: 38 additions & 33 deletions

File tree

‎PCK-Studio/Forms/Editor/CustomSkinEditor.Designer.cs‎

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PCK-Studio/Forms/Editor/CustomSkinEditor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public CustomSkinEditor(Skin skin, ISaveContext<Skin> saveContext, int xmlVersio
4949
_rng = new Random();
5050
_skinPartListBindingSource = new BindingSource(renderer3D1.ModelData, null);
5151
skinPartListBox.DataSource = _skinPartListBindingSource;
52-
skinPartListBox.DisplayMember = "Type";
52+
skinPartListBox.DisplayMember = "DisplayInfo";
5353
_xmlVersion = xmlVersion;
5454
boxEditorControl1.SetBOXVersion(xmlVersion);
5555
_inflateOverlayParts = _xmlVersion > 0;

‎PCK-Studio/Forms/Editor/CustomSkinEditor.resx‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
<value>0, 0</value>
411411
</data>
412412
<data name="skinPartListBox.Size" type="System.Drawing.Size, System.Drawing">
413-
<value>157, 114</value>
413+
<value>157, 113</value>
414414
</data>
415415
<data name="skinPartListBox.TabIndex" type="System.Int32, mscorlib">
416416
<value>0</value>
@@ -508,14 +508,14 @@
508508
<data name="&gt;&gt;skinNameLabel.ZOrder" xml:space="preserve">
509509
<value>16</value>
510510
</data>
511-
<data name="metroTabControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
511+
<data name="parameterTabControl.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
512512
<value>Bottom, Right</value>
513513
</data>
514514
<data name="skinPartsTabPage.Location" type="System.Drawing.Point, System.Drawing">
515515
<value>4, 38</value>
516516
</data>
517517
<data name="skinPartsTabPage.Size" type="System.Drawing.Size, System.Drawing">
518-
<value>157, 114</value>
518+
<value>157, 113</value>
519519
</data>
520520
<data name="skinPartsTabPage.TabIndex" type="System.Int32, mscorlib">
521521
<value>0</value>
@@ -530,7 +530,7 @@
530530
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
531531
</data>
532532
<data name="&gt;&gt;skinPartsTabPage.Parent" xml:space="preserve">
533-
<value>metroTabControl1</value>
533+
<value>parameterTabControl</value>
534534
</data>
535535
<data name="&gt;&gt;skinPartsTabPage.ZOrder" xml:space="preserve">
536536
<value>0</value>
@@ -566,7 +566,7 @@
566566
<value>0, 0</value>
567567
</data>
568568
<data name="offsetListBox.Size" type="System.Drawing.Size, System.Drawing">
569-
<value>157, 114</value>
569+
<value>157, 128</value>
570570
</data>
571571
<data name="offsetListBox.TabIndex" type="System.Int32, mscorlib">
572572
<value>0</value>
@@ -587,7 +587,7 @@
587587
<value>4, 38</value>
588588
</data>
589589
<data name="skinOffsetsTabPage.Size" type="System.Drawing.Size, System.Drawing">
590-
<value>157, 114</value>
590+
<value>157, 128</value>
591591
</data>
592592
<data name="skinOffsetsTabPage.TabIndex" type="System.Int32, mscorlib">
593593
<value>1</value>
@@ -602,30 +602,30 @@
602602
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
603603
</data>
604604
<data name="&gt;&gt;skinOffsetsTabPage.Parent" xml:space="preserve">
605-
<value>metroTabControl1</value>
605+
<value>parameterTabControl</value>
606606
</data>
607607
<data name="&gt;&gt;skinOffsetsTabPage.ZOrder" xml:space="preserve">
608608
<value>1</value>
609609
</data>
610-
<data name="metroTabControl1.Location" type="System.Drawing.Point, System.Drawing">
611-
<value>632, 21</value>
610+
<data name="parameterTabControl.Location" type="System.Drawing.Point, System.Drawing">
611+
<value>632, 22</value>
612612
</data>
613-
<data name="metroTabControl1.Size" type="System.Drawing.Size, System.Drawing">
614-
<value>165, 156</value>
613+
<data name="parameterTabControl.Size" type="System.Drawing.Size, System.Drawing">
614+
<value>165, 155</value>
615615
</data>
616-
<data name="metroTabControl1.TabIndex" type="System.Int32, mscorlib">
616+
<data name="parameterTabControl.TabIndex" type="System.Int32, mscorlib">
617617
<value>1</value>
618618
</data>
619-
<data name="&gt;&gt;metroTabControl1.Name" xml:space="preserve">
620-
<value>metroTabControl1</value>
619+
<data name="&gt;&gt;parameterTabControl.Name" xml:space="preserve">
620+
<value>parameterTabControl</value>
621621
</data>
622-
<data name="&gt;&gt;metroTabControl1.Type" xml:space="preserve">
622+
<data name="&gt;&gt;parameterTabControl.Type" xml:space="preserve">
623623
<value>MetroFramework.Controls.MetroTabControl, MetroFramework, Version=1.4.0.0, Culture=neutral, PublicKeyToken=5f91a84759bf584a</value>
624624
</data>
625-
<data name="&gt;&gt;metroTabControl1.Parent" xml:space="preserve">
625+
<data name="&gt;&gt;parameterTabControl.Parent" xml:space="preserve">
626626
<value>$this</value>
627627
</data>
628-
<data name="&gt;&gt;metroTabControl1.ZOrder" xml:space="preserve">
628+
<data name="&gt;&gt;parameterTabControl.ZOrder" xml:space="preserve">
629629
<value>3</value>
630630
</data>
631631
<data name="renderer3D1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">

‎PckStudio.Core/Skin/SkinBOX.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,11 @@ public record SkinBOX : IEquatable<SkinBOX>
9393
public int ArmorMaskFlags { get; }
9494
public bool Mirror { get; }
9595
public float Scale { get; }
96+
// Simplified display info for the CustomSkinEditor
97+
public string DisplayInfo
98+
{
99+
get { return $"{Type} ({Size.X}x{Size.Y}x{Size.Z})".Replace(',', '.'); }
100+
}
96101

97102
public SkinBOX(string type, Vector3 pos, Vector3 size, Vector2 uv,
98103
int armorMaskFlags = 0, bool mirror = false, float scale = 0.0f)

0 commit comments

Comments
 (0)