diff --git a/SpineViewer/Controls/SpinePropertyGrid.Designer.cs b/SpineViewer/Controls/SpinePropertyGrid.Designer.cs index 350861e..279cb22 100644 --- a/SpineViewer/Controls/SpinePropertyGrid.Designer.cs +++ b/SpineViewer/Controls/SpinePropertyGrid.Designer.cs @@ -46,6 +46,8 @@ contextMenuStrip_Animation = new ContextMenuStrip(components); toolStripMenuItem_AddAnimation = new ToolStripMenuItem(); toolStripMenuItem_RemoveAnimation = new ToolStripMenuItem(); + tabPage_Debug = new TabPage(); + propertyGrid_Debug = new PropertyGrid(); tabControl.SuspendLayout(); tabPage_BaseInfo.SuspendLayout(); tabPage_Render.SuspendLayout(); @@ -54,6 +56,7 @@ contextMenuStrip_Skin.SuspendLayout(); tabPage_Animation.SuspendLayout(); contextMenuStrip_Animation.SuspendLayout(); + tabPage_Debug.SuspendLayout(); SuspendLayout(); // // tabControl @@ -64,6 +67,7 @@ tabControl.Controls.Add(tabPage_Transform); tabControl.Controls.Add(tabPage_Skin); tabControl.Controls.Add(tabPage_Animation); + tabControl.Controls.Add(tabPage_Debug); tabControl.Dock = DockStyle.Fill; tabControl.ItemSize = new Size(100, 35); tabControl.Location = new Point(0, 0); @@ -71,20 +75,20 @@ tabControl.Name = "tabControl"; tabControl.Padding = new Point(0, 0); tabControl.SelectedIndex = 0; - tabControl.Size = new Size(365, 448); + tabControl.Size = new Size(372, 448); tabControl.SizeMode = TabSizeMode.FillToRight; tabControl.TabIndex = 0; // // tabPage_BaseInfo // + tabPage_BaseInfo.BackColor = SystemColors.Control; tabPage_BaseInfo.Controls.Add(propertyGrid_BaseInfo); tabPage_BaseInfo.Location = new Point(4, 4); tabPage_BaseInfo.Margin = new Padding(0); tabPage_BaseInfo.Name = "tabPage_BaseInfo"; - tabPage_BaseInfo.Size = new Size(357, 405); + tabPage_BaseInfo.Size = new Size(364, 370); tabPage_BaseInfo.TabIndex = 0; tabPage_BaseInfo.Text = "基本信息"; - tabPage_BaseInfo.UseVisualStyleBackColor = true; // // propertyGrid_BaseInfo // @@ -93,20 +97,20 @@ propertyGrid_BaseInfo.Location = new Point(0, 0); propertyGrid_BaseInfo.Name = "propertyGrid_BaseInfo"; propertyGrid_BaseInfo.PropertySort = PropertySort.Alphabetical; - propertyGrid_BaseInfo.Size = new Size(357, 405); + propertyGrid_BaseInfo.Size = new Size(364, 370); propertyGrid_BaseInfo.TabIndex = 0; propertyGrid_BaseInfo.ToolbarVisible = false; // // tabPage_Render // + tabPage_Render.BackColor = SystemColors.Control; tabPage_Render.Controls.Add(propertyGrid_Render); tabPage_Render.Location = new Point(4, 4); tabPage_Render.Margin = new Padding(0); tabPage_Render.Name = "tabPage_Render"; - tabPage_Render.Size = new Size(357, 405); + tabPage_Render.Size = new Size(437, 405); tabPage_Render.TabIndex = 1; tabPage_Render.Text = "渲染"; - tabPage_Render.UseVisualStyleBackColor = true; // // propertyGrid_Render // @@ -115,20 +119,20 @@ propertyGrid_Render.Location = new Point(0, 0); propertyGrid_Render.Name = "propertyGrid_Render"; propertyGrid_Render.PropertySort = PropertySort.Alphabetical; - propertyGrid_Render.Size = new Size(357, 405); + propertyGrid_Render.Size = new Size(437, 405); propertyGrid_Render.TabIndex = 1; propertyGrid_Render.ToolbarVisible = false; // // tabPage_Transform // + tabPage_Transform.BackColor = SystemColors.Control; tabPage_Transform.Controls.Add(propertyGrid_Transform); tabPage_Transform.Location = new Point(4, 4); tabPage_Transform.Margin = new Padding(0); tabPage_Transform.Name = "tabPage_Transform"; - tabPage_Transform.Size = new Size(357, 405); + tabPage_Transform.Size = new Size(437, 405); tabPage_Transform.TabIndex = 2; tabPage_Transform.Text = "变换"; - tabPage_Transform.UseVisualStyleBackColor = true; // // propertyGrid_Transform // @@ -137,20 +141,20 @@ propertyGrid_Transform.Location = new Point(0, 0); propertyGrid_Transform.Name = "propertyGrid_Transform"; propertyGrid_Transform.PropertySort = PropertySort.Alphabetical; - propertyGrid_Transform.Size = new Size(357, 405); + propertyGrid_Transform.Size = new Size(437, 405); propertyGrid_Transform.TabIndex = 1; propertyGrid_Transform.ToolbarVisible = false; // // tabPage_Skin // + tabPage_Skin.BackColor = SystemColors.Control; tabPage_Skin.Controls.Add(propertyGrid_Skin); tabPage_Skin.Location = new Point(4, 4); tabPage_Skin.Margin = new Padding(0); tabPage_Skin.Name = "tabPage_Skin"; - tabPage_Skin.Size = new Size(357, 405); + tabPage_Skin.Size = new Size(437, 405); tabPage_Skin.TabIndex = 3; tabPage_Skin.Text = "皮肤"; - tabPage_Skin.UseVisualStyleBackColor = true; // // propertyGrid_Skin // @@ -160,7 +164,7 @@ propertyGrid_Skin.Location = new Point(0, 0); propertyGrid_Skin.Name = "propertyGrid_Skin"; propertyGrid_Skin.PropertySort = PropertySort.NoSort; - propertyGrid_Skin.Size = new Size(357, 405); + propertyGrid_Skin.Size = new Size(437, 405); propertyGrid_Skin.TabIndex = 1; propertyGrid_Skin.ToolbarVisible = false; // @@ -188,14 +192,14 @@ // // tabPage_Animation // + tabPage_Animation.BackColor = SystemColors.Control; tabPage_Animation.Controls.Add(propertyGrid_Animation); tabPage_Animation.Location = new Point(4, 4); tabPage_Animation.Margin = new Padding(0); tabPage_Animation.Name = "tabPage_Animation"; - tabPage_Animation.Size = new Size(357, 405); + tabPage_Animation.Size = new Size(437, 405); tabPage_Animation.TabIndex = 4; tabPage_Animation.Text = "动画"; - tabPage_Animation.UseVisualStyleBackColor = true; // // propertyGrid_Animation // @@ -205,7 +209,7 @@ propertyGrid_Animation.Location = new Point(0, 0); propertyGrid_Animation.Name = "propertyGrid_Animation"; propertyGrid_Animation.PropertySort = PropertySort.NoSort; - propertyGrid_Animation.Size = new Size(357, 405); + propertyGrid_Animation.Size = new Size(437, 405); propertyGrid_Animation.TabIndex = 1; propertyGrid_Animation.ToolbarVisible = false; // @@ -231,13 +235,34 @@ toolStripMenuItem_RemoveAnimation.Text = "移除"; toolStripMenuItem_RemoveAnimation.Click += toolStripMenuItem_RemoveAnimation_Click; // + // tabPage_Debug + // + tabPage_Debug.BackColor = SystemColors.Control; + tabPage_Debug.Controls.Add(propertyGrid_Debug); + tabPage_Debug.Location = new Point(4, 4); + tabPage_Debug.Name = "tabPage_Debug"; + tabPage_Debug.Size = new Size(437, 405); + tabPage_Debug.TabIndex = 5; + tabPage_Debug.Text = "调试"; + // + // propertyGrid_Debug + // + propertyGrid_Debug.Dock = DockStyle.Fill; + propertyGrid_Debug.HelpVisible = false; + propertyGrid_Debug.Location = new Point(0, 0); + propertyGrid_Debug.Name = "propertyGrid_Debug"; + propertyGrid_Debug.PropertySort = PropertySort.NoSort; + propertyGrid_Debug.Size = new Size(437, 405); + propertyGrid_Debug.TabIndex = 2; + propertyGrid_Debug.ToolbarVisible = false; + // // SpinePropertyGrid // AutoScaleDimensions = new SizeF(11F, 24F); AutoScaleMode = AutoScaleMode.Font; Controls.Add(tabControl); Name = "SpinePropertyGrid"; - Size = new Size(365, 448); + Size = new Size(372, 448); tabControl.ResumeLayout(false); tabPage_BaseInfo.ResumeLayout(false); tabPage_Render.ResumeLayout(false); @@ -246,6 +271,7 @@ contextMenuStrip_Skin.ResumeLayout(false); tabPage_Animation.ResumeLayout(false); contextMenuStrip_Animation.ResumeLayout(false); + tabPage_Debug.ResumeLayout(false); ResumeLayout(false); } @@ -268,5 +294,7 @@ private ToolStripMenuItem toolStripMenuItem_RemoveSkin; private ToolStripMenuItem toolStripMenuItem_AddAnimation; private ToolStripMenuItem toolStripMenuItem_RemoveAnimation; + private TabPage tabPage_Debug; + private PropertyGrid propertyGrid_Debug; } } diff --git a/SpineViewer/Controls/SpinePropertyGrid.cs b/SpineViewer/Controls/SpinePropertyGrid.cs index a423fdb..0022273 100644 --- a/SpineViewer/Controls/SpinePropertyGrid.cs +++ b/SpineViewer/Controls/SpinePropertyGrid.cs @@ -34,6 +34,7 @@ namespace SpineViewer.Controls propertyGrid_Transform.SelectedObject = null; propertyGrid_Skin.SelectedObject = null; propertyGrid_Animation.SelectedObject = null; + propertyGrid_Debug.SelectedObject = null; } else { @@ -43,6 +44,7 @@ namespace SpineViewer.Controls propertyGrid_Transform.SelectedObjects = value.Select(e => e.Transform).ToArray(); propertyGrid_Skin.SelectedObjects = value.Select(e => e.Skin).ToArray(); propertyGrid_Animation.SelectedObjects = value.Select(e => e.Animation).ToArray(); + propertyGrid_Debug.SelectedObjects = value.Select(e => e.Debug).ToArray(); } } } diff --git a/SpineViewer/MainForm.Designer.cs b/SpineViewer/MainForm.Designer.cs index bd29722..d1fcf9b 100644 --- a/SpineViewer/MainForm.Designer.cs +++ b/SpineViewer/MainForm.Designer.cs @@ -272,7 +272,7 @@ rtbLog.Margin = new Padding(3, 2, 3, 2); rtbLog.Name = "rtbLog"; rtbLog.ReadOnly = true; - rtbLog.Size = new Size(1758, 164); + rtbLog.Size = new Size(1758, 168); rtbLog.TabIndex = 0; rtbLog.Text = ""; rtbLog.WordWrap = false; @@ -296,7 +296,7 @@ splitContainer_MainForm.Panel2.Controls.Add(rtbLog); splitContainer_MainForm.Panel2.Cursor = Cursors.Default; splitContainer_MainForm.Size = new Size(1758, 1097); - splitContainer_MainForm.SplitterDistance = 925; + splitContainer_MainForm.SplitterDistance = 921; splitContainer_MainForm.SplitterWidth = 8; splitContainer_MainForm.TabIndex = 3; splitContainer_MainForm.TabStop = false; @@ -320,7 +320,7 @@ // splitContainer_Functional.Panel2.Controls.Add(groupBox_Preview); splitContainer_Functional.Panel2.Cursor = Cursors.Default; - splitContainer_Functional.Size = new Size(1758, 925); + splitContainer_Functional.Size = new Size(1758, 921); splitContainer_Functional.SplitterDistance = 759; splitContainer_Functional.SplitterWidth = 8; splitContainer_Functional.TabIndex = 2; @@ -344,7 +344,7 @@ // splitContainer_Information.Panel2.Controls.Add(tabControl_Config); splitContainer_Information.Panel2.Cursor = Cursors.Default; - splitContainer_Information.Size = new Size(759, 925); + splitContainer_Information.Size = new Size(759, 921); splitContainer_Information.SplitterDistance = 354; splitContainer_Information.SplitterWidth = 8; splitContainer_Information.TabIndex = 1; @@ -358,7 +358,7 @@ groupBox_SkelList.Dock = DockStyle.Fill; groupBox_SkelList.Location = new Point(0, 0); groupBox_SkelList.Name = "groupBox_SkelList"; - groupBox_SkelList.Size = new Size(354, 925); + groupBox_SkelList.Size = new Size(354, 921); groupBox_SkelList.TabIndex = 0; groupBox_SkelList.TabStop = false; groupBox_SkelList.Text = "模型列表"; @@ -368,7 +368,7 @@ spineListView.Dock = DockStyle.Fill; spineListView.Location = new Point(3, 26); spineListView.Name = "spineListView"; - spineListView.Size = new Size(348, 896); + spineListView.Size = new Size(348, 892); spineListView.SpinePropertyGrid = spinePropertyGrid; spineListView.TabIndex = 0; // @@ -377,7 +377,7 @@ spinePropertyGrid.Dock = DockStyle.Fill; spinePropertyGrid.Location = new Point(3, 26); spinePropertyGrid.Name = "spinePropertyGrid"; - spinePropertyGrid.Size = new Size(383, 853); + spinePropertyGrid.Size = new Size(383, 849); spinePropertyGrid.TabIndex = 0; // // tabControl_Config @@ -390,8 +390,9 @@ tabControl_Config.Location = new Point(0, 0); tabControl_Config.Multiline = true; tabControl_Config.Name = "tabControl_Config"; + tabControl_Config.Padding = new Point(0, 0); tabControl_Config.SelectedIndex = 0; - tabControl_Config.Size = new Size(397, 925); + tabControl_Config.Size = new Size(397, 921); tabControl_Config.TabIndex = 0; // // tabPage_Previewer @@ -400,7 +401,7 @@ tabPage_Previewer.Location = new Point(4, 4); tabPage_Previewer.Margin = new Padding(0); tabPage_Previewer.Name = "tabPage_Previewer"; - tabPage_Previewer.Size = new Size(389, 882); + tabPage_Previewer.Size = new Size(389, 878); tabPage_Previewer.TabIndex = 0; tabPage_Previewer.Text = "画面参数"; // @@ -411,7 +412,7 @@ groupBox_PreviewConfig.Location = new Point(0, 0); groupBox_PreviewConfig.Margin = new Padding(0); groupBox_PreviewConfig.Name = "groupBox_PreviewConfig"; - groupBox_PreviewConfig.Size = new Size(389, 882); + groupBox_PreviewConfig.Size = new Size(389, 878); groupBox_PreviewConfig.TabIndex = 1; groupBox_PreviewConfig.TabStop = false; groupBox_PreviewConfig.Text = "画面参数"; @@ -422,7 +423,7 @@ propertyGrid_Previewer.HelpVisible = false; propertyGrid_Previewer.Location = new Point(3, 26); propertyGrid_Previewer.Name = "propertyGrid_Previewer"; - propertyGrid_Previewer.Size = new Size(383, 853); + propertyGrid_Previewer.Size = new Size(383, 849); propertyGrid_Previewer.TabIndex = 1; propertyGrid_Previewer.ToolbarVisible = false; propertyGrid_Previewer.PropertyValueChanged += propertyGrid_PropertyValueChanged; @@ -434,7 +435,7 @@ tabPage_SpineProperty.Location = new Point(4, 4); tabPage_SpineProperty.Margin = new Padding(0); tabPage_SpineProperty.Name = "tabPage_SpineProperty"; - tabPage_SpineProperty.Size = new Size(389, 882); + tabPage_SpineProperty.Size = new Size(389, 878); tabPage_SpineProperty.TabIndex = 1; tabPage_SpineProperty.Text = "模型参数"; // @@ -445,7 +446,7 @@ groupBox_SkelConfig.Location = new Point(0, 0); groupBox_SkelConfig.Margin = new Padding(0); groupBox_SkelConfig.Name = "groupBox_SkelConfig"; - groupBox_SkelConfig.Size = new Size(389, 882); + groupBox_SkelConfig.Size = new Size(389, 878); groupBox_SkelConfig.TabIndex = 0; groupBox_SkelConfig.TabStop = false; groupBox_SkelConfig.Text = "模型参数"; @@ -456,7 +457,7 @@ groupBox_Preview.Dock = DockStyle.Fill; groupBox_Preview.Location = new Point(0, 0); groupBox_Preview.Name = "groupBox_Preview"; - groupBox_Preview.Size = new Size(991, 925); + groupBox_Preview.Size = new Size(991, 921); groupBox_Preview.TabIndex = 1; groupBox_Preview.TabStop = false; groupBox_Preview.Text = "预览画面"; @@ -467,7 +468,7 @@ spinePreviewer.Location = new Point(3, 26); spinePreviewer.Name = "spinePreviewer"; spinePreviewer.PropertyGrid = propertyGrid_Previewer; - spinePreviewer.Size = new Size(985, 896); + spinePreviewer.Size = new Size(985, 892); spinePreviewer.SpineListView = spineListView; spinePreviewer.TabIndex = 0; // diff --git a/SpineViewer/PropertyGridWrappers/Spine/SpineWrapper.cs b/SpineViewer/PropertyGridWrappers/Spine/SpineWrapper.cs index e05f6f4..b46b8ec 100644 --- a/SpineViewer/PropertyGridWrappers/Spine/SpineWrapper.cs +++ b/SpineViewer/PropertyGridWrappers/Spine/SpineWrapper.cs @@ -13,15 +13,12 @@ namespace SpineViewer.PropertyGridWrappers.Spine [Browsable(false)] public SpineViewer.Spine.Spine Spine { get; } = spine; - [TypeConverter(typeof(ExpandableObjectConverter))] [DisplayName("基本信息")] public SpineBaseInfoWrapper BaseInfo { get; } = new(spine); - [TypeConverter(typeof(ExpandableObjectConverter))] [DisplayName("渲染")] public SpineRenderWrapper Render { get; } = new(spine); - [TypeConverter(typeof(ExpandableObjectConverter))] [DisplayName("变换")] public SpineTransformWrapper Transform { get; } = new(spine); @@ -32,5 +29,8 @@ namespace SpineViewer.PropertyGridWrappers.Spine [TypeConverter(typeof(ExpandableObjectConverter))] [DisplayName("动画")] public SpineAnimationWrapper Animation { get; } = new(spine); + + [DisplayName("调试")] + public SpineDebugWrapper Debug { get; } = new(spine); } }