diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 0766790f..5e58affc 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 03dd9c61..2a8a5c38 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 8c0697fc..f4694d9b 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 9f25fed7..d23e4a37 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache index 5f514a53..1e2d66ec 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ diff --git a/Switch_Toolbox_Library/Forms/Custom/STPropertyGrid.cs b/Switch_Toolbox_Library/Forms/Custom/STPropertyGrid.cs index 55cc034f..1e608869 100644 --- a/Switch_Toolbox_Library/Forms/Custom/STPropertyGrid.cs +++ b/Switch_Toolbox_Library/Forms/Custom/STPropertyGrid.cs @@ -48,15 +48,20 @@ namespace Switch_Toolbox.Library.Forms } Action OnPropertyChanged; - public void LoadProperty(object selectedObject, Action onPropertyChanged) + Action OnPropertyChanged2; + + public void LoadProperty(object selectedObject, Action onPropertyChanged = null, Action onPropertyChanged2 = null) { OnPropertyChanged = onPropertyChanged; + OnPropertyChanged2 = onPropertyChanged2; + propertyGrid1.SelectedObject = selectedObject; } private void propertyGrid1_PropertyValueChanged(object s, PropertyValueChangedEventArgs e) { OnPropertyChanged(); + OnPropertyChanged2(); } } } diff --git a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImagePropertiesEditor.Designer.cs b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImagePropertiesEditor.Designer.cs index 56a506f9..7f390c95 100644 --- a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImagePropertiesEditor.Designer.cs +++ b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImagePropertiesEditor.Designer.cs @@ -97,6 +97,7 @@ this.stPropertyGrid1.ShowHintDisplay = true; this.stPropertyGrid1.Size = new System.Drawing.Size(219, 508); this.stPropertyGrid1.TabIndex = 0; + this.stPropertyGrid1.Load += new System.EventHandler(this.stPropertyGrid1_Load); // // tabPage1 // @@ -114,12 +115,12 @@ this.stChannelToolstripMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.replaceChannelToolStripMenuItem}); this.stChannelToolstripMenu.Name = "stChannelToolstripMenu"; - this.stChannelToolstripMenu.Size = new System.Drawing.Size(181, 48); + this.stChannelToolstripMenu.Size = new System.Drawing.Size(163, 26); // // replaceChannelToolStripMenuItem // this.replaceChannelToolStripMenuItem.Name = "replaceChannelToolStripMenuItem"; - this.replaceChannelToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.replaceChannelToolStripMenuItem.Size = new System.Drawing.Size(162, 22); this.replaceChannelToolStripMenuItem.Text = "Replace Channel"; this.replaceChannelToolStripMenuItem.Click += new System.EventHandler(this.replaceChannelToolStripMenuItem_Click); // diff --git a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImagePropertiesEditor.cs b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImagePropertiesEditor.cs index d5848e7f..8ddc7841 100644 --- a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImagePropertiesEditor.cs +++ b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImagePropertiesEditor.cs @@ -73,17 +73,22 @@ namespace Switch_Toolbox.Library.Forms stPropertyGrid1.Invoke(new MethodInvoker( delegate () { - stPropertyGrid1.LoadProperty(prop, OnPropertyChanged); + stPropertyGrid1.LoadProperty(prop, OnPropertyChanged, OnPropertyEditorChanged); stPropertyGrid1.Refresh(); })); } else { - stPropertyGrid1.LoadProperty(prop, OnPropertyChanged); + stPropertyGrid1.LoadProperty(prop, OnPropertyChanged, OnPropertyEditorChanged); stPropertyGrid1.Refresh(); } } + private void OnPropertyEditorChanged() + { + imageEditor.UpdateMipDisplay(); + } + public void UpdateProperties() { if (stPropertyGrid1.InvokeRequired) @@ -263,5 +268,10 @@ namespace Switch_Toolbox.Library.Forms break; } } + + private void stPropertyGrid1_Load(object sender, EventArgs e) + { + + } } } diff --git a/Toolbox/Lib/Syroot.NintenTools.Bfres.dll b/Toolbox/Lib/Syroot.NintenTools.Bfres.dll index 0cf85e07..86b095b1 100644 Binary files a/Toolbox/Lib/Syroot.NintenTools.Bfres.dll and b/Toolbox/Lib/Syroot.NintenTools.Bfres.dll differ diff --git a/Toolbox/Lib/Syroot.NintenTools.Bfres.pdb b/Toolbox/Lib/Syroot.NintenTools.Bfres.pdb index d0857ca9..8256a2bb 100644 Binary files a/Toolbox/Lib/Syroot.NintenTools.Bfres.pdb and b/Toolbox/Lib/Syroot.NintenTools.Bfres.pdb differ