Mirrors/Switch-Toolbox
2
0
Fork 0
mirror of https://github.com/KillzXGaming/Switch-Toolbox synced 2024-11-16 01:37:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only decode again if the format changes to speed up edits.

Browse source
This commit is contained in:
KillzXGaming 2019-04-29 20:09:15 -04:00
parent f2befb966b
commit f4cd0a9098
6 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.vs/Switch_Toolbox/v15/.suo
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide
View file

Binary file not shown.

BIN
.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
View file

Binary file not shown.

BIN
Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
View file

Binary file not shown.

23
Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs
View file

@ -881,17 +881,24 @@ namespace Switch_Toolbox.Library.Forms
if (Result == DialogResult.Yes)
{
if (FormatToChange != TEX_FORMAT.UNKNOWN)
bool DecodeTextureBack = false;
if (FormatToChange != TEX_FORMAT.UNKNOWN && ActiveTexture.Format != FormatToChange)
{
ActiveTexture.Format = FormatToChange;
DecodeTextureBack = true;
}
if (FileName.EndsWith(".dds"))
if (FileName.EndsWith(".dds"))
{
DDS dds = new DDS(FileName);
SaveAndApplyImage(dds.GetBitmap());
if (dds.Format != ActiveTexture.Format)
DecodeTextureBack = true;
SaveAndApplyImage(dds.GetBitmap(), DecodeTextureBack);
}
else
{
SaveAndApplyImage(new Bitmap(FileName));
SaveAndApplyImage(new Bitmap(FileName), DecodeTextureBack);
}
}
else
@ -901,7 +908,7 @@ namespace Switch_Toolbox.Library.Forms
}
}
private void SaveAndApplyImage(Bitmap image)
private void SaveAndApplyImage(Bitmap image, bool DecodeBack)
{
if (saveBtn.InvokeRequired)
{
@ -912,7 +919,8 @@ namespace Switch_Toolbox.Library.Forms
ApplyEdit(image);
//Update the image with decoding as format could change
UpdateImage(ActiveTexture);
if (DecodeBack)
UpdateImage(ActiveTexture);
}));
}
else
@ -921,7 +929,8 @@ namespace Switch_Toolbox.Library.Forms
ApplyEdit(image);
//Update the image with decoding as format could change
UpdateImage(ActiveTexture);
if (DecodeBack)
UpdateImage(ActiveTexture);
}
propertiesEditor.UpdateProperties();